Continued to add more friendly URL support.