improve sql parser & wall