Filter listing fixes