SQL script improvements
Widget / Cleaning.