Calendar ajax and controller tweaks