Store also type_deps, build_index part ready.
type_deps for query part
Changed the test query to use new sets