Use proper query and field