* (bug 22744) Add/Update indexes for queries done by the API