Fix issues with filtering and component data