Seperate organizations and groups in search index.

At the moment organizations and groups appear as groups in the search index.