Shorten query time attempt 2
Merge branch 'development'