Move to include barangay in data for mapping