Add filtering for issues
Merge branch 'bpa'