..F....... [DEV-538] fixed order of field names