Improve pseudo folder handling