Fixed repeater field conditional logic issues

Signed-off-by: Elliot Condon <e@elliotcondon.com>