Merged in changes and set Map Fragment to use substrings instead of charAt()s