Fix for revision 8ab4f7a, so that values set in query string appear again

Change-Id: I51ea742469ff5786ca309562efebb2649de92d3a