Updated the App to use the new indexing