replace service name only indexer with a definition one on a Set data indexder. refactor of all services it make it atleast workable. we need todo mass refactoring now to improvement usability and performance