Begun work to fix search error bug