REALLY adding Search and Index MR
Removing unused imported classes and protecting implementations