Fix removal of buses, limit zooming on locate