Fix connection specific identifiers quoting and router usage