Fix for non-incremental queries.