second part fixed. For first I try it and it is real problem. I need to find how to escape it with methods we have. So not merge it yet.