fix querries