Hotfixes to fitter and to team page