added context for query strategy