diff --git a/src/leveled_bookie.erl b/src/leveled_bookie.erl
index d7dfa56..c09087b 100644
--- a/src/leveled_bookie.erl
+++ b/src/leveled_bookie.erl
@@ -591,26 +591,10 @@ snapshot_store(LedgerCache, Penciller, Inker, SnapType, Query, LongRunning) ->
                     LedgerCacheReady#ledger_cache.index,
                     LedgerCacheReady#ledger_cache.min_sqn,
                     LedgerCacheReady#ledger_cache.max_sqn},
-    LongRunning0 =
-        case LongRunning of 
-            undefined  ->
-                case Query of
-                    undefined ->
-                        true;
-                    no_lookup ->
-                        true;
-                    _ ->
-                        % If a specific query has been defined, then not expected
-                        % to be long running
-                        false
-                end;
-            TrueOrFalse ->
-                TrueOrFalse
-        end,
     PCLopts = #penciller_options{start_snapshot = true,
                                     source_penciller = Penciller,
                                     snapshot_query = Query,
-                                    snapshot_longrunning = LongRunning0,
+                                    snapshot_longrunning = LongRunning,
                                     bookies_mem = BookiesMem},
     {ok, LedgerSnapshot} = leveled_penciller:pcl_start(PCLopts),
     case SnapType of
diff --git a/src/leveled_tictac.erl b/src/leveled_tictac.erl
index 3f7bc4f..85cec4e 100644
--- a/src/leveled_tictac.erl
+++ b/src/leveled_tictac.erl
@@ -553,6 +553,12 @@ exportable_test() ->
     {Int1, Int2} = tictac_hash(<<"key">>, <<"value">>),
     ?assertMatch({true, true}, {Int1 >= 0, Int2 >=0}).
 
+merge_emptytree_test() ->
+    TreeA = new_tree("A"),
+    TreeB = new_tree("B"),
+    TreeC = merge_trees(TreeA, TreeB),
+    ?assertMatch([], find_dirtyleaves(TreeA, TreeC)).
+
 -endif.