Fix some typo and correct oject used for filtering