indent fix
partially implemnted HashMap into searcher (untested)