I think R.id.housenumber is not correct because I don't see layout xml update . It would be good to update it and replace R.id.Phone ->  R.id.StreetName as well.

I think this is more like a direction commit rather than a working patch.