Queries now working for every field