tweaks to fit tweaks in filter_table