Added correct popup menu for deleted folder and added filtering by deleted