made sorting by continget work right, and updated filters
fixed merge conflicts
Merge pull request #166 from LasseSviland/master

made sorting by continget work right, and updated filters