Maybe rename `shorten_query` into `request_query` to reduce ambiguity?