Fix issue with new embedder and AJAX