AOI preview bugs fixed