cleanup: combined search + searchdata into one class