renaming fields a little bit for more positive truthiness
moving query for expired into scope