Improving regex for map recognition