Improve web formats

Improve web formats support