improve sql-wall
Merge remote-tracking branch 'upstream/master'