Fix on drop-downs creation