Nested quotes fix

Fixes and improves nested quotes