Last fixes for the 'embed' feature refs #18619