fixed forking of changed queries