code in the server and customer feedback #127, close #142, close #143, close #144, close #145 (addresses are server based)