url processing fix + some addition rules