Cleanup select boxes with custom JS interaction.
Merge branch 'develop'