fixed context query