Added string arrays for better map search