Bugfixes on Calendar and Question and Answer Filter