Fix bad request with heb_location