Fixes the queries helper issue for this branch.