adding support for GET query params