test
Merge branch 'pekka_dev'
Added filtering - entry filtering does not work!