Fixed ordering of settings screens, also incorrect reference to
descriptions for filters options: remove matches and expression.
Merge remote-tracking branch 'github/master'