major fixes for service
location works