added quote validation, need to fix error screen