rework http "query" handling to get closer to standard