Implement indexer for search
Merge branch 'search' into develop