Query utility class
fix
merged