working on more restrictive queries