Add filter + spelling fixes