Updated policy query