Slight changes on search classes
Moved service register to dedicated private method
Coding style