context query bug resolved