TimeSort plugin, some fix