Improved URI regexp