Adding KAP template to the survey module

And some bug fixes.