Ckozak/filtering

Pull request for this feature in order to ease communication and review of changes.