Minor improvements in handling request's path