Akshay/Pooja: Fixed the current week value in week choices