Fix reordering for 2 specific entities, add alert message on reorder