CDB-3722 #fixes clean overlays