Fixed #9 - switched search to filter