search fix, location string fix