fixed first query
Fixed queries