ECMS-4332 Support relooking