added conditional fields to feature, changed sort order