VE-1351 Fixes from CR on verifying map is deleted