Bugfixes and get the custom customer locator working