Change stubs to return same format as links and add import FTS indexing