Much simplified listing filtering

Work in progress