Update logic for drop-down list Further refactoring of the logic for the drop-down lists into new module files See merge request !24
