Extended filters with sort option.
Merge remote-tracking branch 'origin/master'