Better handling of determinating which module should be enabled according to search type when page loads. Issue #22