improve addressentry handling