Use all selected validity periods when rendering

While at it cleanup code