Improve insertion of completed items with namespace prefix.