fix custom field choice filters