Many bug fixed related to the Trash