References #94 - Updated select box check logic