Simplifies searching.
Merge pull request #70 from jmeas/users-query

Simplifies searching.