issue-1 Added filtering.