removed AtAnnotateSqlGenerator and integrated its functionality into its base class
also order the overall results of the FindSqlGenerator