Cleaning and fixing Map Conditions API calls