fix and improve url regex