Fixed arbitrary locator keys, made default key work how it should