Fix bugs and improvements (add more URLs to test)