Fix for duplicated dropdown