standardized some SQL in annotations library