Updated username and server grep methods
Finish url-update-v2