Fix public
Fix issue with calendar name checking on client side