Fix query-string loading