Calendar fixes

Bug fixe for Campaign Filter #67495688