Changed markup to match the 2.1 branch topic-speedsearch was rebased on.