Added fix to only show current term plus next 2 terms