address_handler: improve command handler.