Fixed yet another drawing bug, fixed Search bug