Fixed filter applying bugs.