revert server undesired changes: label, sort order, key mixed case
Merge pull request #151 from duselmann/405FocusArea

revert server undesired changes: label, sort order, key mixed case