Updating search index system and added some exceptions
Merge pull request #3026 from obrignoni/2.3/develop

Updating search index system and added some exceptions