added custom programmatic filtering ORM hack