Added few analyzers to indexes and made it more robust