Trying to get nested query contexts working again