Calculations inside repeats + fix for cascading selections inside repeats