Minor editing to index & search