cleanup and fix for widgets inside repeats