#11 issues filtering implemented