Add 'StringTrim' filters to usg_id and passport_id fields
CS fixes