Improved fetch strategy & value for locators