more fixes to the locator service

Locator service was not respecting locator expiration time