Properly remeber sort settings in all cases (Issue #836)
Fixes a bug where stored sort column / sort order is not used when directory specific settings are enabled.
Fixes a bug where stored sort column / sort order is not used when directory specific settings are enabled.