Minor refactoring of generic type of SearchEngine