Improved handling of block-container and forms