[incremental search] cleanup && fixing module dependencies