Remove query params, replace with factory params