* Minor adjustments to handle the "Monster" test widget for default widgets
* Minor adjustment to handle default 'searchform' output