Embed filter fixes