move OrderBy magic to it's own shortcut