- Fixed matcher and sorter behavior.