Improvements

• Fixed an issue where sites with names containing special characters were not being discovered.
• Other minor improvements.