Added search for visible stops. Needs more testing atm.