change queries to one that workeD