work on search
roll back to the correct db name….
clean indentation
Merge pull request #717 from simod/master-search

work on search