Fix issue with structured queries on URL

Fix issue where structured queries containing '=' don't get serialized to the URL properly. This is a (simpler) alternative fix to the one already provided.