If you take a look at what I added, you will see that I just moved the id to the form.  (The support-search form is also implemented this way.)