PIM-2492: Update behavior of ORM base filter