Revision of queries and models
Merge branch 'master' of github.com:101companies/101worker