Initial support for named options

Added a ThenBy to sort by TargetOptionsName after order