Possibly reduce the cost of queries (increases the number of queries)
Merge branch 'correcting380_suggesting_keywords_faster' into develop