Fixed the query divider bug.
Merge branch 'fix_divider_bug'