fix for empty query string.
Merge branch 'fix-empty-querystring'