Improving map behaviour
Active/disable tabs depending on response type
Minor change