AV-13 Minor refactoring
AV-13 Fixed minor glitch in select box