Use a form for the searchbox

Change-Id: I98a55e39904ca33c504337700d37bb9873eedb51
Followup:  I3101738d0800d77caf6b8253361117af0b550a4a
Merge "Use a form for the searchbox"