Added capability to disable location selector