Deal with the API max for now :/
Deal with the API max for now :/
Merge branch 'improve-tailing' into hs_staging

* improve-tailing:
  Deal with the API max for now :/