first commit for new searchService and some major issues fixed by Sonar
helps