Multiple URL bug fix
Improved URL matching