fixing SQLGenerator
fixing more