More robust non-boulevard query