VID-1854 expand logic refined