Fixup location -> search update