Adding back in support for additional search modules.