Move value sorting to the respective dimension
Fix selection grouping
Sort selected annotations