Make filter_by_ctnr more general
Adjust special case for global and default
basic field filtering by container