reduced helper complexity
fixed issues created after extracting super class
fix for undefined name status after refresh