improved context queries