Fixed some query issues, leaning more toward http_build_query() for resolution