Quotes Control

Added Quotes control, to apply correct quote marks..