Remove some of filter code, mock 'search deeper'
remove more filter code