several changes to make filtering possible
Merge branch 'development'