Make URL lookup more metadata rich