Fix for embedded documents, pre-fill