Fix connection specific identifiers quoting and router usage
Merge pull request #237 from daevaorn/quote

Fix connection specific identifiers quoting and router usage