WIP: use the generated filter expressions