hometree feature integration : Fix several issues