removed grouped results, added context queries instead