Simplify internal functions and add user feedback
Corrections to the URL regexp