Fixed missing escaping
Added IDatatabseRouterFactory