Improved filters
Temp fix for evaluation, maybe fixed ordering by numbers issue
Merge branch 'feature/landingpage' into develop