Updated some of the usda sqls to avoid null value in query