Filter By Type implemented