Clean-up variable names in _entered and _managed & fix generation of URL back to competition from _managed