Add context to query