As I'v found? there was a number errors in new SQL system.

so here is a patch, with code comments.
Hope it helps.