almost done.. Problem with SearchHandler.