Switched conditional test order
Fix year query set when none provided

Make sure correct year is used when generating from current date.
Added content for pre-1984 archives