update demo with select fix and breakout of help block logic code