Code cleanup after merge

Added support for default select box item.