fix type filter
Merge branch 'develop'