Ending condition is done in entities_alter().
WIP, ending date condition needs to be in the query, but this one has timing issue.