Fixing logic for weekly calendar view
Adding in multiple select