Added support for single user query
Merge branch 'feature/sms' of https://github.com/sgtonkin/greenfield into feature/sms