Updated key regex to match newer URL format