Fixing 2 issues in Sortable Extension:
Use `addOrderBy` instead of `setOrderBy`, otherwise other sorting statements will be discarded.
Check if SortOrder is already set on newly created objects (in this case there's no need to overwrite the value)