Shorten query time attempt 1
Merge branch 'development'