Refactor step to make it parameterised

I'm about to use it to create two sites in one scenario.
Scope tags autocomplete to the site