Code refactor

Refactor URL query strings building with `http_build_query` function