Fix location search, style fixes