Adding thomas_id, fixing house id