fix quote and eval handling