Fix parameterized options not changing value in Queries

Fix the same bug as #226 but without doing a reverse commit.
Verified on both dropdown and input