Fixing hpt query string.
Merge branch 'bug-hpt-query-string' into development