ADAT Fix layout bug and add layout to KAP assessment

Bug was in the deduplicator for the importer. So all survey templates that have been imported may be affected :(