Improved plugin sort (2)