Fix/public repo round2

Maybe these locators could go to the DOM, and also, with format, not %