improved filter and order function
Merge branch 'master' of github.com:ddsc/dikedata-api