Feature/sqlparser fix