Optimized result tabs update & added comments