Split retrieving imports into separate tasks.
Fix incorrect nabl-uri behaviour.
Remove with clauses from query.str.