Added a new toggle to skip commented trees