enhanced routing
improved searching