Changed back to one query.
Merge branch 'develop'