DAR-2922, DAR-2908, DAR-2903, fix bugs in large modal

for code review only