fix expire dates and soql 101 issue