Hotfix overview component duplicate fields