fixed address and address insert sql to match new fields