Fix URI parsing to look for query in the URI as opposed to separate POST parameters