Search working, and some more name cleaning