[*] FO : a few more SQL improvements