fixed filtering/sorting bug
Merge branch 'gh-pages'