Added feature Flexible URL matching