Fix generator handling

Previously, if you switched to action=query, selected a generator
and set some its properties, these parameters were still applied
to request and hash.

Change-Id: I10d67af79679b2c4d1b5e45cf8832a6edeb46203