Fixed sorting on drop and initialise