business logic fix and location status fix