#18 final fixes on SearchService