LPS-34589 fix escape for select_site and apply consistent pattern everywhere