added index for 'context.query'