improve URL mapping