Fixed the query divider bug.
Merge branch 'fix_query_divider_bug'