fixing from #hash to ?search