fixed not passing tests (dropdown) + small improvements. refs #HOT-42