Moved to new Background Job API, fixed Terms Of Service display logic