Further work on webpage support (INTERMEDIATE)