Enable saving null location/provider if corresponding filter is disabled

Currently, the expanded cohort filter query requires a valid location or provider parameter even if the option to filter by location/provider is disabled respectively. There's a need to enable saving null location/provider if the corresponding filter is disabled