Fix to work with sorting and filtering
Merge pull request #8 from alexspeller/master

Fix to work with sorting and filtering