Updated Search and Index View