Tentative offering: SQL tweak and some house keeping