Fix #466, fix #475, fix #470

Fixes issues with hidden options and using the data-container with
keyboard
v1.5.2
Merge pull request #506 from caseyjhol/master

v1.5.2