ENHANCEMENT - adding SearchFilter and tests