Shorten query time attempt 3