added limit to query
Merge branch 'develop' into bugfix/limit
Merge branch 'bugfix/limit' into develop