Fixes #380

Fixed table escaping

Escaped table names and pkwy column