Issue #1285364 by Cliff: Follow-up to remove search-block-form template for form rendering consistency.