Re-add sort by name to ML non-simple filter.

When replacing 'sort by extension' with
'sort by name' in simple filter mode, 'sort by name'
was erroneously removed from non-simple filter
mode too (and replaced by a second incarnation of
'sort by extension').

Signed-off-by: Thomas Hochstein <thh@inter.net>
Merge pull request #171 from th-h/issue-157

Re-add sort by name to ML non-simple filter (#157).