Optimise visibility search