Move filter logic to componentINstance to component for better testability