Update to add generic filters

Signed-off-by: Deepak Jha <deepak.jha@turn.com>