Fixing default sorting