Degrade fix for DB query change.