Feature filtering functionality is now functional and updated corresponding unit tests