- Temporary Fix to redirect back if location not selected
- added check for active Service