Add serach filter

Working on issue #7