changes to support new generico filter