Fix issue with missing before widget markup