WIP - Don't append query string if query string is empty.