Week and year selector now works a little better