#18 SearchService fixes