diff --git a/database/inforex-v1.0-changelog.sql b/database/inforex-v1.0-changelog.sql
index 844e9dac..dd187e81 100644
--- a/database/inforex-v1.0-changelog.sql
+++ b/database/inforex-v1.0-changelog.sql
@@ -653,4 +653,9 @@ ALTER TABLE `reports` ADD `deleted` BOOLEAN NOT NULL DEFAULT FALSE AFTER `parent
 
 --changeset czuk:15
 
-UPDATE `report_perspectives` SET `id` = 'annotator_wsd' WHERE `report_perspectives`.`id` = 'annotatorwsd';
\ No newline at end of file
+UPDATE `report_perspectives` SET `id` = 'annotator_wsd' WHERE `report_perspectives`.`id` = 'annotatorwsd';
+
+--changeset czuk:16
+
+DROP VIEW IF EXISTS `reports_annotations`;
+CREATE VIEW `reports_annotations` AS select `ra`.`id` AS `id`,`ra`.`report_id` AS `report_id`,`ra`.`type_id` AS `type_id`,`at`.`name` AS `type`,`at`.`group_id` AS `group`,`ra`.`from` AS `from`,`ra`.`to` AS `to`,`ra`.`text` AS `text`,`ra`.`user_id` AS `user_id`,`ra`.`creation_time` AS `creation_time`,`ra`.`stage` AS `stage`,`ra`.`source` AS `source` from (`inforex`.`reports_annotations_optimized` `ra` left join `inforex`.`annotation_types` `at` on((`at`.`annotation_type_id` = `ra`.`type_id`)));
diff --git a/engine/templates/page_corpus_settings.tpl b/engine/templates/page_corpus_settings.tpl
index e67ac34c..110ab753 100644
--- a/engine/templates/page_corpus_settings.tpl
+++ b/engine/templates/page_corpus_settings.tpl
@@ -28,7 +28,9 @@
     </nav>
 	
     <div style="margin: 4px">
-        {include file="$subpage_file"}
+	{if isset($subpage_file) }
+        	{include file="$subpage_file"}
+	{/if}
     </div>
 	
 	</div>