update to use refactored swap-placeholders
update to use only required query params