Fix endless recursion in drawing filter settings.
Merge branch 'tng' into rework-sorting