* Improve app indexing

