Fixing order by optional field