Fix lexer and support quoted text