modified query