BP-13061 - New Query