refactor(locators): moves scope in locators to last argument