bug fixing and changes of layout in --list --advanced in CL