GCP-7562 Manage Location and Method Checkbox handling