Will do these two changes. The reason for using just `form` is that there is only one form, but since I expect to tweak this on the future maybe adding extra forms (maybe for locally filtering or grouping the results when we have Open-Tran like results) I think it is much better doing it the right way from the start.