Separate filter from import