Make filter_by_ctnr more consistent