Fix dropdown dependency and exceptions