Security advisory GHSA-gxcm-36qw-j29v: SQL Injection in tribalsystems/zenario
Package: tribalsystems/zenario (composer), vulnerable version: 8.8, fixed in: 8.8.53370
CWE: CWE-89
Files changed by the fix:
zenario/admin/admin_boxes.ajax.php
zenario/admin/admin_toolbar.ajax.php
zenario/admin/db_updates/latest_revision_no.inc.php
zenario/admin/db_updates/step_1_update_the_updater_itself/data_archive.inc.php
zenario/admin/db_updates/step_1_update_the_updater_itself/updater_tables.inc.php
zenario/admin/db_updates/step_2_update_the_database_schema/admin_tables.inc.php
zenario/admin/db_updates/step_2_update_the_database_schema/content_tables.inc.php
zenario/admin/db_updates/step_2_update_the_database_schema/user_tables.inc.php
zenario/admin/db_updates/step_3_populate_certain_tables/document_types.inc.php
zenario/admin/db_updates/step_3_populate_certain_tables/language_names.inc.php
zenario/admin/db_updates/step_3_populate_certain_tables/page_preview_sizes.inc.php
zenario/admin/db_updates/step_4_migrate_the_data/admin_tables.inc.php
zenario/admin/db_updates/step_4_migrate_the_data/content_tables.inc.php
zenario/admin/db_updates/step_4_migrate_the_data/external_programs.inc.php
zenario/admin/db_updates/step_4_migrate_the_data/plugins.inc.php
zenario/admin/db_updates/step_4_migrate_the_data/user_tables.inc.php
zenario/admin/dev_tools/doc_tools.js
zenario/admin/layout_preview.php
zenario/admin/organizer.ajax.php
zenario/admin/quick_ajax.php
zenario/admin/welcome.ajax.php
zenario/admin/welcome.php
zenario/adminheader.inc.php
zenario/ajax.php
zenario/autoload/admin.php
zenario/autoload/adminAdm.php
zenario/autoload/cache.php
zenario/autoload/category.php
zenario/autoload/categoryAdm.php
zenario/autoload/content.php
zenario/autoload/contentAdm.php
zenario/autoload/cookie.php
zenario/autoload/curl.php
zenario/autoload/dataset.php
zenario/autoload/datasetAdm.php
zenario/autoload/date.php
zenario/autoload/db.php
zenario/autoload/dbAdm.php
zenario/autoload/deprecated.php
zenario/autoload/document.php
zenario/autoload/error.php
zenario/autoload/escape.php
zenario/autoload/file.php
zenario/autoload/fileAdm.php
zenario/autoload/fun/addNeededSpecialPages.php
zenario/autoload/fun/cache.php
zenario/autoload/fun/checkPassword.php
zenario/autoload/fun/checkSlotsWereUsed.php
zenario/autoload/fun/cleanDirs.php
zenario/autoload/fun/clearCache.php
zenario/autoload/fun/createBackupScript.php
zenario/autoload/fun/createDraft.php
zenario/autoload/fun/getAdminPhraseCode.php
zenario/autoload/fun/getSmartGroupDescription.php
zenario/autoload/fun/importVisitorLanguagePack.php
zenario/autoload/fun/modules.php
zenario/autoload/fun/modulesAndTUIXFiles.php
zenario/autoload/fun/pageBody.php
zenario/autoload/fun/pageBodyAdminClass.php
zenario/autoload/fun/pageBodyAdminToolbar.php
zenario/autoload/fun/pageFoot.php
zenario/autoload/fun/pageFootInAdminMode.php
zenario/autoload/fun/pageHead.php
zenario/autoload/fun/processRules.php
zenario/autoload/fun/redirectToPage.php
zenario/autoload/fun/rerenderWorkingCopyImages.php
zenario/autoload/fun/restoreFromBackup.php
zenario/autoload/fun/setSession.php
zenario/autoload/fun/setupSlotControls.php
zenario/autoload/fun/showConsentBox.php
zenario/autoload/fun/showHideImageOptions.php
zenario/autoload/fun/showStartSitePageIfNeeded.php
zenario/autoload/fun/sql.php
zenario/autoload/fun/startIncludeAdminControls.php
zenario/autoload/fun/syncInlineFileContentLink.php
zenario/autoload/fun/syncInlineFileLinks.php
zenario/autoload/fun/syncSuperAdmin.php
zenario/autoload/fun/zAPIFrameworkField.php
zenario/autoload/gridAdm.php
zenario/autoload/lang.php
zenario/autoload/layoutAdm.php
zenario/autoload/link.php
zenario/autoload/menu.php
zenario/autoload/menuAdm.php
zenario/autoload/miscAdm.php
zenario/autoload/module.php
zenario/autoload/moduleAdm.php
zenario/autoload/moduleBaseClass.php
zenario/autoload/pageCache.php
zenario/autoload/phi.php
zenario/autoload/phiParser.php
zenario/autoload/phraseAdm.php
zenario/autoload/plugin.php
zenario/autoload/pluginAdm.php
zenario/autoload/priv.php
zenario/autoload/ray.php
zenario/autoload/ring.php
zenario/autoload/row-da.php
zenario/autoload/row-g.php
zenario/autoload/row.php
zenario/autoload/server.php
zenario/autoload/site.php
zenario/autoload/skinAdm.php
zenario/autoload/smartGroup.php
zenario/autoload/sql-da.php
zenario/autoload/sql-g.php
zenario/autoload/sql.php
zenario/autoload/tuix.php
zenario/autoload/twig.php
zenario/autoload/user.php
zenario/autoload/userAdm.php
zenario/autoload/welcome.php
zenario/autoload/wrapper.php
zenario/basicheader.inc.php
zenario/cookie_message.php
zenario/cookies.php
zenario/editions.inc.php
zenario/file.php
zenario/has_database_changed_and_is_cache_out_of_date.php
zenario/includes/ajax.post_display.inc.php
zenario/includes/ajax.pre_load.inc.php
zenario/includes/index.post_display.inc.php
zenario/includes/index.pre_load.inc.php
zenario/includes/js_minify.inc.php
zenario/includes/twig.inc.php
zenario/includes/wrapper.post_display.inc.php
zenario/includes/wrapper.pre_load.inc.php
zenario/index.php
zenario/js/ace.wrapper.js.php
zenario/js/admin.js
zenario/js/admin.microtemplates_and_phrases.js.php
zenario/js/admin.wrapper.js.php
zenario/js/admin_box.js
zenario/js/admin_box_toolkit.js
zenario/js/admin_form.js
zenario/js/admin_grid_maker.js
zenario/js/admin_grid_maker.min.js
zenario/js/admin_layout_preview.js
zenario/js/admin_organizer.js
zenario/js/admin_skin_editor.js
zenario/js/admin_toolbar.js
zenario/js/admin_welcome.js
zenario/js/base_definitions.js
zenario/js/body.js
zenario/js/dev_tools.js
zenario/js/form.js
zenario/js/grid.js
zenario/js/highcharts.wrapper.js.php
zenario/js/ie.wrapper.js.php
zenario/js/js_minify.shell.php
zenario/js/organizer.wrapper.js.php
zenario/js/panel_type_admin_box_builder.js
zenario/js/panel_type_form_builder.js
zenario/js/panel_type_form_builder_base_class.js
zenario/js/panel_type_google_map.js
zenario/js/panel_type_google_map_or_list.js
zenario/js/panel_type_grid.js
zenario/js/panel_type_hierarchy.js
zenario/js/panel_type_hierarchy_documents.js
zenario/js/panel_type_hierarchy_with_lazy_load.js
zenario/js/panel_type_list.js
zenario/js/panel_type_list_or_grid.js
zenario/js/panel_type_list_with_caching_disabled.js
zenario/js/panel_type_list_with_master_switch.js
zenario/js/panel_type_list_with_subheadings.js
zenario/js/panel_type_list_with_totals.js
zenario/js/panel_type_list_with_totals_on_refiners.js
zenario/js/panel_type_multi_line_list.js
zenario/js/panel_type_multi_line_list_or_grid.js
zenario/js/panel_type_network_graph.js
zenario/js/panel_type_slot_reload_on_change.js
zenario/js/panel_type_start_page.js
zenario/js/plugin.wrapper.js.php
zenario/js/slide_designer.js
zenario/js/slide_designer_microtemplates.js.php
zenario/js/tidy_libs.shell.php
zenario/js/tuix.js
zenario/js/tuix.ready.js
zenario/js/tuix.wrapper.js.php
zenario/js/visitor.js
zenario/js/visitor.phrases.js.php
zenario/js/visitor.ready.js
zenario/js/visitor.wrapper.js.php
zenario/js/wizard.js
zenario/modules/zenario_abstract_fea/fun/handleNavigationInFormat.php
zenario/modules/zenario_abstract_fea/fun/handleNavigationInValidate.php
zenario/modules/zenario_abstract_fea/fun/loadSlotSettings.php
zenario/modules/zenario_abstract_fea/fun/saveDatasetFields.php
zenario/modules/zenario_abstract_fea/fun/saveSlotSettingsAndClose.php
zenario/modules/zenario_abstract_fea/fun/setupDatasetFields.php
zenario/modules/zenario_abstract_fea/fun/setupOverridesForPhrases.php
zenario/modules/zenario_abstract_fea/fun/slideLayoutPrivacyDesc.php
zenario/modules/zenario_abstract_fea/js/form.js
zenario/modules/zenario_abstract_fea/module_code.php
zenario/modules/zenario_abstract_list/module_code.php
zenario/modules/zenario_abstract_manager/module_code.php
zenario/modules/zenario_abstract_viewer/module_code.php
zenario/modules/zenario_access_key_map/module_code.php
zenario/modules/zenario_advanced_interface_tools_fea/classes/admin_boxes/plugin_settings.php
zenario/modules/zenario_advanced_interface_tools_fea/classes/admin_boxes/site_settings.php
zenario/modules/zenario_advanced_interface_tools_fea/classes/visitor/create_tuix_snippet.php
zenario/modules/zenario_advanced_interface_tools_fea/classes/visitor/edit_tuix_snippet.php
zenario/modules/zenario_advanced_interface_tools_fea/classes/visitor/list_tuix_snippets.php
zenario/modules/zenario_advanced_interface_tools_fea/module_code.php
zenario/modules/zenario_advanced_search/module_code.php
zenario/modules/zenario_anonymous_comments/db_updates/comments_email_templates.inc.php
zenario/modules/zenario_anonymous_comments/db_updates/comments_tables.inc.php
zenario/modules/zenario_anonymous_comments/fun/addReply.php
zenario/modules/zenario_anonymous_comments/fun/fillAdminBox.php
zenario/modules/zenario_anonymous_comments/fun/fillOrganizerPanel.php
zenario/modules/zenario_anonymous_comments/fun/formatAdminBox.php
zenario/modules/zenario_anonymous_comments/fun/handleOrganizerPanelAJAX.php
zenario/modules/zenario_anonymous_comments/fun/reportPost.php
zenario/modules/zenario_anonymous_comments/fun/sendApproveRequest.php
zenario/modules/zenario_anonymous_comments/fun/sendEmailNotification.php
zenario/modules/zenario_anonymous_comments/fun/showPostScreen.php
zenario/modules/zenario_anonymous_comments/fun/threadActionHandler.php
zenario/modules/zenario_anonymous_comments/js/plugin.js
zenario/modules/zenario_anonymous_comments/module_code.php
zenario/modules/zenario_banner/classes/admin_boxes/plugin_settings.php
zenario/modules/zenario_banner/classes/visitor/slot_settings_zenario_banner.php
zenario/modules/zenario_banner/js/admin.js
zenario/modules/zenario_banner/module_code.php
zenario/modules/zenario_breadcrumbs/module_code.php
zenario/modules/zenario_comments/db_updates/comments_email_templates.inc.php
zenario/modules/zenario_comments/db_updates/comments_tables.inc.php
zenario/modules/zenario_comments/fun/sendEmailNotificationToSubscribers.php
zenario/modules/zenario_comments/module_code.php
zenario/modules/zenario_common_features/classes/admin_boxes/admin.php
zenario/modules/zenario_common_features/classes/admin_boxes/admin_copy_perms.php
zenario/modules/zenario_common_features/classes/admin_boxes/alias.php
zenario/modules/zenario_common_features/classes/admin_boxes/backup.php
zenario/modules/zenario_common_features/classes/admin_boxes/categories.php
zenario/modules/zenario_common_features/classes/admin_boxes/change_tags.php
zenario/modules/zenario_common_features/classes/admin_boxes/content.php
zenario/modules/zenario_common_features/classes/admin_boxes/content_categories.php
zenario/modules/zenario_common_features/classes/admin_boxes/content_categories_add.php
zenario/modules/zenario_common_features/classes/admin_boxes/content_categories_remove.php
zenario/modules/zenario_common_features/classes/admin_boxes/content_layout.php
zenario/modules/zenario_common_features/classes/admin_boxes/content_type_details.php
zenario/modules/zenario_common_features/classes/admin_boxes/create_vlp.php
zenario/modules/zenario_common_features/classes/admin_boxes/custom_dataset.php
zenario/modules/zenario_common_features/classes/admin_boxes/delete_draft.php
zenario/modules/zenario_common_features/classes/admin_boxes/delete_language.php
zenario/modules/zenario_common_features/classes/admin_boxes/document_folder.php
zenario/modules/zenario_common_features/classes/admin_boxes/document_move.php
zenario/modules/zenario_common_features/classes/admin_boxes/document_properties.php
zenario/modules/zenario_common_features/classes/admin_boxes/document_rename.php
zenario/modules/zenario_common_features/classes/admin_boxes/document_rule.php
zenario/modules/zenario_common_features/classes/admin_boxes/document_tag.php
zenario/modules/zenario_common_features/classes/admin_boxes/document_upload.php
zenario/modules/zenario_common_features/classes/admin_boxes/download_sample_file.php
zenario/modules/zenario_common_features/classes/admin_boxes/duplicate_plugin.php
zenario/modules/zenario_common_features/classes/admin_boxes/enable_site.php
zenario/modules/zenario_common_features/classes/admin_boxes/export_content_items.php
zenario/modules/zenario_common_features/classes/admin_boxes/export_dataset.php
zenario/modules/zenario_common_features/classes/admin_boxes/export_vlp.php
zenario/modules/zenario_common_features/classes/admin_boxes/file_type.php
zenario/modules/zenario_common_features/classes/admin_boxes/head_foot_slot.php
zenario/modules/zenario_common_features/classes/admin_boxes/help_line.php
zenario/modules/zenario_common_features/classes/admin_boxes/image.php
zenario/modules/zenario_common_features/classes/admin_boxes/image_tag.php
zenario/modules/zenario_common_features/classes/admin_boxes/import.php
zenario/modules/zenario_common_features/classes/admin_boxes/layout.php
zenario/modules/zenario_common_features/classes/admin_boxes/menu.php
zenario/modules/zenario_common_features/classes/admin_boxes/menu_text.php
zenario/modules/zenario_common_features/classes/admin_boxes/migrate_old_documents.php
zenario/modules/zenario_common_features/classes/admin_boxes/page_preview_size.php
zenario/modules/zenario_common_features/classes/admin_boxes/phrase.php
zenario/modules/zenario_common_features/classes/admin_boxes/plugin_settings.php
zenario/modules/zenario_common_features/classes/admin_boxes/publish.php
zenario/modules/zenario_common_features/classes/admin_boxes/reorder_documents.php
zenario/modules/zenario_common_features/classes/admin_boxes/salutation.php
zenario/modules/zenario_common_features/classes/admin_boxes/setup_language.php
zenario/modules/zenario_common_features/classes/admin_boxes/setup_module.php
zenario/modules/zenario_common_features/classes/admin_boxes/site_reset.php
zenario/modules/zenario_common_features/classes/admin_boxes/site_settings.php
zenario/modules/zenario_common_features/classes/admin_boxes/skin_editor.php
zenario/modules/zenario_common_features/classes/admin_boxes/spare_domains.php
zenario/modules/zenario_common_features/classes/admin_boxes/styles_fab_black.php
zenario/modules/zenario_common_features/classes/admin_boxes/styles_fab_white.php
zenario/modules/zenario_common_features/classes/admin_boxes/translate_phrase.php
zenario/modules/zenario_common_features/classes/admin_boxes/trash.php
zenario/modules/zenario_common_features/classes/admin_boxes/trash_admin.php
zenario/modules/zenario_common_features/classes/admin_boxes/tuix_snippet.php
zenario/modules/zenario_common_features/classes/admin_boxes/upload_replacement_document.php
zenario/modules/zenario_common_features/classes/admin_boxes/view_source_code.php
zenario/modules/zenario_common_features/classes/organizer/administrators.php
zenario/modules/zenario_common_features/classes/organizer/background_images.php
zenario/modules/zenario_common_features/classes/organizer/backups.php
zenario/modules/zenario_common_features/classes/organizer/by_language.php
zenario/modules/zenario_common_features/classes/organizer/categories.php
zenario/modules/zenario_common_features/classes/organizer/chained.php
zenario/modules/zenario_common_features/classes/organizer/content.php
zenario/modules/zenario_common_features/classes/organizer/content_types.php
zenario/modules/zenario_common_features/classes/organizer/custom_datasets.php
zenario/modules/zenario_common_features/classes/organizer/custom_fields.php
zenario/modules/zenario_common_features/classes/organizer/custom_tabs_and_fields_gui.php
zenario/modules/zenario_common_features/classes/organizer/dataset_files.php
zenario/modules/zenario_common_features/classes/organizer/document_folders.php
zenario/modules/zenario_common_features/classes/organizer/document_rules.php
zenario/modules/zenario_common_features/classes/organizer/document_tags.php
zenario/modules/zenario_common_features/classes/organizer/documents.php
zenario/modules/zenario_common_features/classes/organizer/file_types.php
zenario/modules/zenario_common_features/classes/organizer/image_library.php
zenario/modules/zenario_common_features/classes/organizer/image_tags.php
zenario/modules/zenario_common_features/classes/organizer/language_equivs.php
zenario/modules/zenario_common_features/classes/organizer/languages.php
zenario/modules/zenario_common_features/classes/organizer/layouts.php
zenario/modules/zenario_common_features/classes/organizer/loading_message.php
zenario/modules/zenario_common_features/classes/organizer/menu_nodes.php
zenario/modules/zenario_common_features/classes/organizer/menu_position.php
zenario/modules/zenario_common_features/classes/organizer/modules.php
zenario/modules/zenario_common_features/classes/organizer/page_preview_sizes.php
zenario/modules/zenario_common_features/classes/organizer/phrases.php
zenario/modules/zenario_common_features/classes/organizer/plugins.php
zenario/modules/zenario_common_features/classes/organizer/salutations.php
zenario/modules/zenario_common_features/classes/organizer/sections.php
zenario/modules/zenario_common_features/classes/organizer/site_settings.php
zenario/modules/zenario_common_features/classes/organizer/skin_files.php
zenario/modules/zenario_common_features/classes/organizer/skins.php
zenario/modules/zenario_common_features/classes/organizer/slots.php
zenario/modules/zenario_common_features/classes/organizer/spare_domains.php
zenario/modules/zenario_common_features/classes/organizer/start_page.php
zenario/modules/zenario_common_features/classes/organizer/template_families.php
zenario/modules/zenario_common_features/classes/organizer/tuix_snippets.php
zenario/modules/zenario_common_features/classes/organizer/view_frameworks.php
zenario/modules/zenario_common_features/classes/visitor/slot_plugin_and_mode.php
zenario/modules/zenario_common_features/db_updates/document_dataset.inc.php
zenario/modules/zenario_common_features/db_updates/email_templates.inc.php
zenario/modules/zenario_common_features/db_updates/updates.inc.php
zenario/modules/zenario_common_features/edition_includes/publishContent.php
zenario/modules/zenario_common_features/fun/deleteCategory.php
zenario/modules/zenario_common_features/fun/fillAdminToolbar.php
zenario/modules/zenario_common_features/fun/fillAllAdminSlotControls.php
zenario/modules/zenario_common_features/fun/fillOrganizerNav.php
zenario/modules/zenario_common_features/fun/getTranslationsAndPluginsLinkingToThisContentItem.php
zenario/modules/zenario_common_features/fun/handleAJAX.php
zenario/modules/zenario_common_features/fun/handleAdminToolbarAJAX.php
zenario/modules/zenario_common_features/fun/pageNumbers.php
zenario/modules/zenario_common_features/fun/validateCategory.php
zenario/modules/zenario_common_features/module_code.php
zenario/modules/zenario_content_list/fun/formatAdminBox.php
zenario/modules/zenario_content_list/module_code.php
zenario/modules/zenario_content_notifications/classes/admin_boxes/admin.php
zenario/modules/zenario_content_notifications/classes/admin_boxes/content_requests.php
zenario/modules/zenario_content_notifications/classes/admin_boxes/publish.php
zenario/modules/zenario_content_notifications/classes/admin_boxes/site_settings.php
zenario/modules/zenario_content_notifications/classes/organizer/content.php
zenario/modules/zenario_content_notifications/db_updates/admin_content_notifications.inc.php
zenario/modules/zenario_content_notifications/module_code.php
zenario/modules/zenario_cookie_consent_status/module_code.php
zenario/modules/zenario_copyright/module_code.php
zenario/modules/zenario_country_language_picker/fun/select_country.php
zenario/modules/zenario_country_language_picker/module_code.php
zenario/modules/zenario_country_manager/db_updates/country_manager_countries.inc.php
zenario/modules/zenario_country_manager/fun/fillAdminBox.php
zenario/modules/zenario_country_manager/fun/fillOrganizerPanel.php
zenario/modules/zenario_country_manager/fun/handleOrganizerPanelAJAX.php
zenario/modules/zenario_country_manager/fun/saveAdminBox.php
zenario/modules/zenario_country_manager/fun/validateAdminBox.php
zenario/modules/zenario_country_manager/module_code.php
zenario/modules/zenario_crm_form_integration/classes/admin_boxes/crm_field_name.php
zenario/modules/zenario_crm_form_integration/classes/admin_boxes/last_crm_request.php
zenario/modules/zenario_crm_form_integration/classes/admin_boxes/salesforce_response.php
zenario/modules/zenario_crm_form_integration/classes/admin_boxes/site_settings.php
zenario/modules/zenario_crm_form_integration/classes/admin_boxes/user_form.php
zenario/modules/zenario_crm_form_integration/classes/organizer/crm_field_names.php
zenario/modules/zenario_crm_form_integration/classes/organizer/crm_fields.php
zenario/modules/zenario_crm_form_integration/classes/organizer/salesforce_response_log.php
zenario/modules/zenario_crm_form_integration/classes/organizer/user_forms.php
zenario/modules/zenario_crm_form_integration/module_code.php
zenario/modules/zenario_ctype_audio/module_code.php
zenario/modules/zenario_ctype_event/module_code.php
zenario/modules/zenario_ctype_news/module_code.php
zenario/modules/zenario_document_container/module_code.php
zenario/modules/zenario_document_envelopes_fea/classes/admin_boxes/admin.php
zenario/modules/zenario_document_envelopes_fea/classes/admin_boxes/plugin_settings.php
zenario/modules/zenario_document_envelopes_fea/classes/admin_boxes/site_settings.php
zenario/modules/zenario_document_envelopes_fea/classes/admin_boxes/zenario_document_envelope__details.php
zenario/modules/zenario_document_envelopes_fea/classes/admin_boxes/zenario_envelope_language__details.php
zenario/modules/zenario_document_envelopes_fea/classes/organizer/document_envelopes.php
zenario/modules/zenario_document_envelopes_fea/classes/organizer/envelope_languages.php
zenario/modules/zenario_document_envelopes_fea/classes/visitor/create_document_envelope.php
zenario/modules/zenario_document_envelopes_fea/classes/visitor/edit_document_envelope.php
zenario/modules/zenario_document_envelopes_fea/classes/visitor/list_document_envelopes.php
zenario/modules/zenario_document_envelopes_fea/classes/visitor/list_files_in_document_envelope.php
zenario/modules/zenario_document_envelopes_fea/classes/visitor/no_mode_selected.php
zenario/modules/zenario_document_envelopes_fea/classes/visitor/upload_file_to_document_envelope.php
zenario/modules/zenario_document_envelopes_fea/classes/visitor/view_document_envelope.php
zenario/modules/zenario_document_envelopes_fea/db_updates/custom_dataset.inc.php
zenario/modules/zenario_document_envelopes_fea/db_updates/updates.inc.php
zenario/modules/zenario_document_envelopes_fea/module_code.php
zenario/modules/zenario_email_a_friend/db_updates/email_template.inc.php
zenario/modules/zenario_email_a_friend/module_code.php
zenario/modules/zenario_email_template_manager/db_updates/email_image_conversion.inc.php
zenario/modules/zenario_email_template_manager/db_updates/email_logs.inc.php
zenario/modules/zenario_email_template_manager/db_updates/updates.inc.php
zenario/modules/zenario_email_template_manager/fun/fillAdminBox.php
zenario/modules/zenario_email_template_manager/fun/fillOrganizerPanel.php
zenario/modules/zenario_email_template_manager/fun/formatAdminBox.php
zenario/modules/zenario_email_template_manager/fun/handleOrganizerPanelAJAX.php
zenario/modules/zenario_email_template_manager/fun/saveAdminBox.php
zenario/modules/zenario_email_template_manager/fun/validateAdminBox.php
zenario/modules/zenario_email_template_manager/module_code.php
zenario/modules/zenario_error_log/classes/admin_boxes/clear_error_log.php
zenario/modules/zenario_error_log/classes/admin_boxes/site_settings.php
zenario/modules/zenario_error_log/classes/organizer/error_log.php
zenario/modules/zenario_error_log/module_code.php
zenario/modules/zenario_event_calendar/module_code.php
zenario/modules/zenario_event_listing/module_code.php
zenario/modules/zenario_event_slideshow/module_code.php
zenario/modules/zenario_extranet/db_updates/extranet_email_templates.inc.php
zenario/modules/zenario_extranet/fun/validateFormFields.php
zenario/modules/zenario_extranet/module_code.php
zenario/modules/zenario_extranet_change_email/db_updates/change_address.inc.php
zenario/modules/zenario_extranet_change_email/module_code.php
zenario/modules/zenario_extranet_change_password/db_updates/email_templates.inc.php
zenario/modules/zenario_extranet_change_password/module_code.php
zenario/modules/zenario_extranet_logout/module_code.php
zenario/modules/zenario_extranet_password_reset/db_updates/extranet_password_reset.inc.php
zenario/modules/zenario_extranet_password_reset/module_code.php
zenario/modules/zenario_extranet_profile_edit/module_code.php
zenario/modules/zenario_extranet_registration/db_updates/extranet_registration.inc.php
zenario/modules/zenario_extranet_registration/module_code.php
zenario/modules/zenario_extranet_user_image/module_code.php
zenario/modules/zenario_extranet_user_profile_view/module_code.php
zenario/modules/zenario_extranet_user_profile_view_2/module_code.php
zenario/modules/zenario_feed_reader/db_updates/cache.php
zenario/modules/zenario_feed_reader/module_code.php
zenario/modules/zenario_font_size/js/plugin.js
zenario/modules/zenario_font_size/module_code.php
zenario/modules/zenario_footer/module_code.php
zenario/modules/zenario_forum/db_updates/forum_email_templates.inc.php
zenario/modules/zenario_forum/db_updates/forum_tables.inc.php
zenario/modules/zenario_forum/fun/addReply.php
zenario/modules/zenario_forum/fun/addThread.php
zenario/modules/zenario_forum/fun/calcForumPostCount.php
zenario/modules/zenario_forum/fun/calcThreadPostCount.php
zenario/modules/zenario_forum/fun/deletePost.php
zenario/modules/zenario_forum/fun/deleteThread.php
zenario/modules/zenario_forum/fun/eventUserDeleted.php
zenario/modules/zenario_forum/fun/fillAdminBox.php
zenario/modules/zenario_forum/fun/fillAdminSlotControls.php
zenario/modules/zenario_forum/fun/fillOrganizerPanel.php
zenario/modules/zenario_forum/fun/formatAdminBox.php
zenario/modules/zenario_forum/fun/handleAJAX.php
zenario/modules/zenario_forum/fun/handleOrganizerPanelAJAX.php
zenario/modules/zenario_forum/fun/markThreadAsRead.php
zenario/modules/zenario_forum/fun/moveThreadIntoForum.php
zenario/modules/zenario_forum/fun/saveAdminBox.php
zenario/modules/zenario_forum/fun/sendEmailNotification.php
zenario/modules/zenario_forum/fun/validateAdminBox.php
zenario/modules/zenario_forum/js/admin.js
zenario/modules/zenario_forum/module_code.php
zenario/modules/zenario_forum_list/module_code.php
zenario/modules/zenario_forum_search/module_code.php
zenario/modules/zenario_google_map/fun/showStandalonePage.php
zenario/modules/zenario_google_map/module_code.php
zenario/modules/zenario_html_snippet/module_code.php
zenario/modules/zenario_incoming_email_manager/db_updates/accounts.inc.php
zenario/modules/zenario_incoming_email_manager/mail/email_handler.php
zenario/modules/zenario_incoming_email_manager/module_code.php
zenario/modules/zenario_language_picker/module_code.php
zenario/modules/zenario_location_listing/module_code.php
zenario/modules/zenario_location_manager/db_updates/custom_dataset.inc.php
zenario/modules/zenario_location_manager/db_updates/locations.inc.php
zenario/modules/zenario_location_manager/module_code.php
zenario/modules/zenario_location_map_and_listing/js/plugin.js
zenario/modules/zenario_location_map_and_listing/module_code.php
zenario/modules/zenario_location_map_and_listing_2/js/plugin.js
zenario/modules/zenario_location_map_and_listing_2/module_code.php
zenario/modules/zenario_location_ratings/db_updates/location_ratings.inc.php
zenario/modules/zenario_location_ratings/module_code.php
zenario/modules/zenario_location_viewer/module_code.php
zenario/modules/zenario_menu/fun/fillAdminBox.php
zenario/modules/zenario_menu/module_code.php
zenario/modules/zenario_menu_forward_back_navigator/module_code.php
zenario/modules/zenario_menu_multicolumn/db_updates/nodes_top_of_column.php
zenario/modules/zenario_menu_multicolumn/module_code.php
zenario/modules/zenario_menu_responsive_multilevel_2/module_code.php
zenario/modules/zenario_menu_vertical/module_code.php
zenario/modules/zenario_meta_data/module_code.php
zenario/modules/zenario_multiple_image_container/module_code.php
zenario/modules/zenario_news_ticker/js/plugin.js
zenario/modules/zenario_news_ticker/module_code.php
zenario/modules/zenario_newsletter/classes/admin_boxes/admin.php
zenario/modules/zenario_newsletter/classes/admin_boxes/live_send.php
zenario/modules/zenario_newsletter/classes/admin_boxes/newsletter.php
zenario/modules/zenario_newsletter/classes/admin_boxes/newsletter_template.php
zenario/modules/zenario_newsletter/classes/admin_boxes/site_settings.php
zenario/modules/zenario_newsletter/classes/organizer/image_library.php
zenario/modules/zenario_newsletter/classes/organizer/newsletter_click_throughs.php
zenario/modules/zenario_newsletter/classes/organizer/newsletter_log.php
zenario/modules/zenario_newsletter/classes/organizer/newsletter_templates.php
zenario/modules/zenario_newsletter/classes/organizer/newsletters.php
zenario/modules/zenario_newsletter/classes/organizer/users.php
zenario/modules/zenario_newsletter/db_updates/newsletter_site_settings.inc.php
zenario/modules/zenario_newsletter/db_updates/newsletter_tables.inc.php
zenario/modules/zenario_newsletter/db_updates/newsletter_user_defaults.inc.php
zenario/modules/zenario_newsletter/module_code.php
zenario/modules/zenario_newsletter/tracker/delete_account.php
zenario/modules/zenario_newsletter/tracker/link_tracker.php
zenario/modules/zenario_newsletter/tracker/remove_from_groups.php
zenario/modules/zenario_newsletter/tracker/tracker.php
zenario/modules/zenario_plugin_nest/classes/organizer/conductor.php
zenario/modules/zenario_plugin_nest/classes/organizer/nested_plugins.php
zenario/modules/zenario_plugin_nest/classes/organizer/plugins.php
zenario/modules/zenario_plugin_nest/classes/visitor/slide_info.php
zenario/modules/zenario_plugin_nest/fun/addBanner.php
zenario/modules/zenario_plugin_nest/fun/addPlugin.php
zenario/modules/zenario_plugin_nest/fun/addPluginConfirm.php
zenario/modules/zenario_plugin_nest/fun/addPluginInstance.php
zenario/modules/zenario_plugin_nest/fun/addTwigSnippet.php
zenario/modules/zenario_plugin_nest/fun/duplicatePlugin.php
zenario/modules/zenario_plugin_nest/fun/duplicatePluginConfirm.php
zenario/modules/zenario_plugin_nest/fun/fillAdminSlotControls.php
zenario/modules/zenario_plugin_nest/fun/getBackLinks.php
zenario/modules/zenario_plugin_nest/fun/removePlugin.php
zenario/modules/zenario_plugin_nest/fun/removePluginConfirm.php
zenario/modules/zenario_plugin_nest/fun/removeSlide.php
zenario/modules/zenario_plugin_nest/fun/removeSlideConfirm.php
zenario/modules/zenario_plugin_nest/fun/reorderNest.php
zenario/modules/zenario_plugin_nest/fun/resyncNest.php
zenario/modules/zenario_plugin_nest/js/plugin.js
zenario/modules/zenario_plugin_nest/module_code.php
zenario/modules/zenario_print_page/module_code.php
zenario/modules/zenario_pro_features/classes/admin_boxes/alias.php
zenario/modules/zenario_pro_features/classes/admin_boxes/content.php
zenario/modules/zenario_pro_features/classes/admin_boxes/menu.php
zenario/modules/zenario_pro_features/classes/admin_boxes/menu_section.php
zenario/modules/zenario_pro_features/classes/admin_boxes/menu_text.php
zenario/modules/zenario_pro_features/classes/admin_boxes/pro_features_spare_alias.php
zenario/modules/zenario_pro_features/classes/admin_boxes/site_settings.php
zenario/modules/zenario_pro_features/classes/organizer/chained.php
zenario/modules/zenario_pro_features/classes/organizer/content.php
zenario/modules/zenario_pro_features/classes/organizer/error_log.php
zenario/modules/zenario_pro_features/classes/organizer/languages.php
zenario/modules/zenario_pro_features/classes/organizer/menu_nodes.php
zenario/modules/zenario_pro_features/classes/organizer/sections.php
zenario/modules/zenario_pro_features/classes/organizer/settings_pro_features__spare_aliases.php
zenario/modules/zenario_pro_features/edition_includes/checkRequestVars.php
zenario/modules/zenario_pro_features/edition_includes/index.pre_get_contents.php
zenario/modules/zenario_pro_features/edition_includes/index.pre_header.php
zenario/modules/zenario_pro_features/edition_includes/publishContent.php
zenario/modules/zenario_pro_features/fun/createExportFile.php
zenario/modules/zenario_pro_features/fun/importContentItem.php
zenario/modules/zenario_pro_features/js/cache_info.js
zenario/modules/zenario_pro_features/js/cache_info.min.js
zenario/modules/zenario_pro_features/js/organizer.js
zenario/modules/zenario_pro_features/module_code.php
zenario/modules/zenario_project_locations/db_updates/projects.inc.php
zenario/modules/zenario_project_locations/module_code.php
zenario/modules/zenario_project_sector_service_gallery/module_code.php
zenario/modules/zenario_promo_menu/db_updates/promo_menu.inc.php
zenario/modules/zenario_promo_menu/module_code.php
zenario/modules/zenario_recently_viewed/module_code.php
zenario/modules/zenario_recurring_countdown/module_code.php
zenario/modules/zenario_scheduled_task_manager/cron/run_every_minute.php
zenario/modules/zenario_scheduled_task_manager/fun/fillAdminBox.php
zenario/modules/zenario_scheduled_task_manager/fun/fillOrganizerPanel.php
zenario/modules/zenario_scheduled_task_manager/fun/formatAdminBox.php
zenario/modules/zenario_scheduled_task_manager/fun/handleOrganizerPanelAJAX.php
zenario/modules/zenario_scheduled_task_manager/fun/preFillOrganizerPanel.php
zenario/modules/zenario_scheduled_task_manager/fun/saveAdminBox.php
zenario/modules/zenario_scheduled_task_manager/fun/validateAdminBox.php
zenario/modules/zenario_scheduled_task_manager/installation_check.php
zenario/modules/zenario_scheduled_task_manager/module_code.php
zenario/modules/zenario_search_entry_box/module_code.php
zenario/modules/zenario_search_entry_box_predictive_probusiness/module_code.php
zenario/modules/zenario_search_results/module_code.php
zenario/modules/zenario_search_results_pro/module_code.php
zenario/modules/zenario_sensitive_content_message/db_updates/updates.inc.php
zenario/modules/zenario_sensitive_content_message/fun/accept_sensitive_content_message.php
zenario/modules/zenario_sensitive_content_message/fun/sensitive_content_message.php
zenario/modules/zenario_sensitive_content_message/module_code.php
zenario/modules/zenario_sitemap/module_code.php
zenario/modules/zenario_slideshow/js/interface.js
zenario/modules/zenario_slideshow/js/jquery_cycle2_interface.js
zenario/modules/zenario_slideshow/js/jquery_cycle_interface.js
zenario/modules/zenario_slideshow/js/jquery_roundabout_interface.js
zenario/modules/zenario_slideshow/module_code.php
zenario/modules/zenario_slideshow_simple/module_code.php
zenario/modules/zenario_timezones/js/plugin.js
zenario/modules/zenario_timezones/module_code.php
zenario/modules/zenario_twig_snippet/module_code.php
zenario/modules/zenario_user_consent_forms/db_updates/user_consent_forms.inc.php
zenario/modules/zenario_user_consent_forms/module_code.php
zenario/modules/zenario_user_documents/db_updates/user_document_dataset.inc.php
zenario/modules/zenario_user_documents/latest_revision_no.inc.php
zenario/modules/zenario_user_documents/module_code.php
zenario/modules/zenario_user_forms/classes/admin_boxes/admin.php
zenario/modules/zenario_user_forms/classes/admin_boxes/delete_form_field.php
zenario/modules/zenario_user_forms/classes/admin_boxes/email_template.php
zenario/modules/zenario_user_forms/classes/admin_boxes/export_user_responses.php
zenario/modules/zenario_user_forms/classes/admin_boxes/field_calculation.php
zenario/modules/zenario_user_forms/classes/admin_boxes/import_user_forms.php
zenario/modules/zenario_user_forms/classes/admin_boxes/plugin_settings.php
zenario/modules/zenario_user_forms/classes/admin_boxes/predefined_text_target.php
zenario/modules/zenario_user_forms/classes/admin_boxes/predefined_text_trigger.php
zenario/modules/zenario_user_forms/classes/admin_boxes/site_settings.php
zenario/modules/zenario_user_forms/classes/admin_boxes/user_form.php
zenario/modules/zenario_user_forms/classes/admin_boxes/user_form_response.php
zenario/modules/zenario_user_forms/classes/organizer/content.php
zenario/modules/zenario_user_forms/classes/organizer/form_fields_gui.php
zenario/modules/zenario_user_forms/classes/organizer/predefined_text_targets.php
zenario/modules/zenario_user_forms/classes/organizer/predefined_text_triggers.php
zenario/modules/zenario_user_forms/classes/organizer/user_form_responses.php
zenario/modules/zenario_user_forms/classes/organizer/user_forms.php
zenario/modules/zenario_user_forms/db_updates/user_forms.inc.php
zenario/modules/zenario_user_forms/module_code.php
zenario/modules/zenario_user_profile_search/module_code.php
zenario/modules/zenario_users/classes/admin_boxes/consent.php
zenario/modules/zenario_users/classes/admin_boxes/content.php
zenario/modules/zenario_users/classes/admin_boxes/content_privacy.php
zenario/modules/zenario_users/classes/admin_boxes/export_access_log.php
zenario/modules/zenario_users/classes/admin_boxes/flag.php
zenario/modules/zenario_users/classes/admin_boxes/group.php
zenario/modules/zenario_users/classes/admin_boxes/impersonate.php
zenario/modules/zenario_users/classes/admin_boxes/logout.php
zenario/modules/zenario_users/classes/admin_boxes/mass_group_membership.php
zenario/modules/zenario_users/classes/admin_boxes/site_settings.php
zenario/modules/zenario_users/classes/admin_boxes/smart_group.php
zenario/modules/zenario_users/classes/admin_boxes/user__activate.php
zenario/modules/zenario_users/classes/admin_boxes/user__convert_to_user.php
zenario/modules/zenario_users/classes/admin_boxes/user__delete.php
zenario/modules/zenario_users/classes/admin_boxes/user__details.php
zenario/modules/zenario_users/classes/admin_boxes/user__welcome_email.php
zenario/modules/zenario_users/classes/organizer/access_log.php
zenario/modules/zenario_users/classes/organizer/chained.php
zenario/modules/zenario_users/classes/organizer/consents.php
zenario/modules/zenario_users/classes/organizer/content.php
zenario/modules/zenario_users/classes/organizer/groups.php
zenario/modules/zenario_users/classes/organizer/smart_groups.php
zenario/modules/zenario_users/classes/organizer/users.php
zenario/modules/zenario_users/db_updates/custom_dataset.inc.php
zenario/modules/zenario_users/db_updates/updates.inc.php
zenario/modules/zenario_users/db_updates/users_email_templates.inc.php
zenario/modules/zenario_users/fun/fillAdminToolbar.php
zenario/modules/zenario_users/module_code.php
zenario/modules/zenario_wysiwyg_editor/fun/saveContent.php
zenario/modules/zenario_wysiwyg_editor/js/admin.js
zenario/modules/zenario_wysiwyg_editor/module_code.php
zenario/redirect.php
zenario/reference/panel_type_base_class.js
zenario/reference/plugin_base_class.js
zenario/s3FileUpload.php
zenario/shellheader.inc.php
zenario/sitemap.php
zenario/styles/admin.wrapper.css.php
zenario/styles/module.wrapper.css.php
zenario/styles/organizer.wrapper.css.php
zenario/styles/skin.cache_wrapper.css.php
zenario/visitorheader.inc.php
zenario/wizard.ajax.php
zenario/wizard.php

Fix diff:
diff --git a/license.txt b/license.txt
index 3b6de1f5f..9d6faf5c4 100644
--- a/license.txt
+++ b/license.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2020, Tribal Limited
+Copyright (c) 2021, Tribal Limited
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/package.json b/package.json
index 13238babc..892d417c2 100644
--- a/package.json
+++ b/package.json
@@ -25,5 +25,5 @@
 		"vimeo-upload": "*",
 		"wowjs": "*"
 	},
-	"version": "8.8.52729"
+	"version": "8.8.53370"
 }
\ No newline at end of file
diff --git a/zenario/admin/admin_boxes.ajax.php b/zenario/admin/admin_boxes.ajax.php
index 83f9fc624..2428e7b92 100644
--- a/zenario/admin/admin_boxes.ajax.php
+++ b/zenario/admin/admin_boxes.ajax.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/admin/admin_toolbar.ajax.php b/zenario/admin/admin_toolbar.ajax.php
index 11f8bf422..3558b5dbe 100644
--- a/zenario/admin/admin_toolbar.ajax.php
+++ b/zenario/admin/admin_toolbar.ajax.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/admin/db_install/local-DROP.sql b/zenario/admin/db_install/local-DROP.sql
index 5fefde9d7..635acb00a 100644
--- a/zenario/admin/db_install/local-DROP.sql
+++ b/zenario/admin/db_install/local-DROP.sql
@@ -41,6 +41,7 @@ DROP TABLE IF EXISTS `[[DB_PREFIX]]languages`;
 DROP TABLE IF EXISTS `[[DB_PREFIX]]last_sent_warning_emails`;
 DROP TABLE IF EXISTS `[[DB_PREFIX]]layouts`;
 DROP TABLE IF EXISTS `[[DB_PREFIX]]local_revision_numbers`;
+DROP TABLE IF EXISTS `[[DB_PREFIX]]lock__clean_dirs`;
 DROP TABLE IF EXISTS `[[DB_PREFIX]]lov_salutations`;
 DROP TABLE IF EXISTS `[[DB_PREFIX]]menu_hierarchy`;
 DROP TABLE IF EXISTS `[[DB_PREFIX]]menu_nodes`;
diff --git a/zenario/admin/db_install/local-INSERT.sql b/zenario/admin/db_install/local-INSERT.sql
index 7b83ff5e1..86407af87 100644
--- a/zenario/admin/db_install/local-INSERT.sql
+++ b/zenario/admin/db_install/local-INSERT.sql
@@ -160,7 +160,7 @@ INSERT INTO `[[DB_PREFIX]]plugin_settings` VALUES
 <p>Content items will be visible to administrators only until published. Click on the "Publish" button to make them visible to regular site visitors.</p>
 <p>You will also need to make your site visible to visitors by enabling it in Organizer, in the <a href="zenario/admin/organizer.php#zenario__administration/panels/site_settings//site_disabled">Configuration -&gt; Site settings</a> section.</p>
 <p>You can get support and downloads at <a href="http://zenar.io" target="_blank" rel="noopener">http://zenar.io</a>.</p>
-<p>We hope you enjoy using Zenario.</p>','synchronized_setting','translatable_html',NULL,0,'','remove',NULL),
+<p>We hope you enjoy using Zenario.</p>','version_controlled_content','translatable_html',NULL,0,'','remove',NULL),
  (7,'image',0,12,'synchronized_setting','text','file',12,'','remove',NULL),
  (7,'image_source',0,'_CUSTOM_IMAGE','synchronized_setting','text',NULL,0,'','remove',NULL),
  (7,'title',0,'Just a nice image','synchronized_setting','translatable_text',NULL,0,'','remove',NULL),
@@ -240,7 +240,7 @@ INSERT INTO `[[DB_PREFIX]]plugin_settings` VALUES
  (12,'more_link_text',0,'Discover more','synchronized_setting','translatable_text',NULL,0,'','remove',NULL),
  (13,'html',0,'<p>CONTACT</p>
  <h2>Nam liber tempor</h2>
- <p>Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse<br>molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero<br>eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.</p>','synchronized_setting','translatable_html',NULL,0,'','remove',NULL),
+ <p>Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse<br>molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero<br>eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.</p>','version_controlled_content','translatable_html',NULL,0,'','remove',NULL),
  (14,'user_form',0,1,'synchronized_setting','text','user_form',1,'','remove',NULL),
  (15,'image',0,13,'synchronized_setting','text','file',13,'','remove',NULL),
  (15,'image_source',0,'_CUSTOM_IMAGE','synchronized_setting','text',NULL,0,'','remove',NULL),
diff --git a/zenario/admin/db_updates/latest_revision_no.inc.php b/zenario/admin/db_updates/latest_revision_no.inc.php
index 250a995c7..cc3558d8b 100644
--- a/zenario/admin/db_updates/latest_revision_no.inc.php
+++ b/zenario/admin/db_updates/latest_revision_no.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -37,6 +37,6 @@
 define('ZENARIO_MAJOR_VERSION', '8');
 define('ZENARIO_MINOR_VERSION', '8');
 define('ZENARIO_IS_BUILD', true);
-define('ZENARIO_REVISION', '52729');
+define('ZENARIO_REVISION', '53370');
 
 define('TINYMCE_DIR', 'zenario/libs/manually_maintained/lgpl/tinymce_4_7_3/');
\ No newline at end of file
diff --git a/zenario/admin/db_updates/step_1_update_the_updater_itself/data_archive.inc.php b/zenario/admin/db_updates/step_1_update_the_updater_itself/data_archive.inc.php
index 53e59a7bc..372a8b491 100644
--- a/zenario/admin/db_updates/step_1_update_the_updater_itself/data_archive.inc.php
+++ b/zenario/admin/db_updates/step_1_update_the_updater_itself/data_archive.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/admin/db_updates/step_1_update_the_updater_itself/updater_tables.inc.php b/zenario/admin/db_updates/step_1_update_the_updater_itself/updater_tables.inc.php
index ce8364c1b..d688dc3aa 100644
--- a/zenario/admin/db_updates/step_1_update_the_updater_itself/updater_tables.inc.php
+++ b/zenario/admin/db_updates/step_1_update_the_updater_itself/updater_tables.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/admin/db_updates/step_2_update_the_database_schema/admin_tables.inc.php b/zenario/admin/db_updates/step_2_update_the_database_schema/admin_tables.inc.php
index 731892c56..de1fb8cc1 100644
--- a/zenario/admin/db_updates/step_2_update_the_database_schema/admin_tables.inc.php
+++ b/zenario/admin/db_updates/step_2_update_the_database_schema/admin_tables.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/admin/db_updates/step_2_update_the_database_schema/content_tables.inc.php b/zenario/admin/db_updates/step_2_update_the_database_schema/content_tables.inc.php
index ecc5d812f..48ff59dac 100644
--- a/zenario/admin/db_updates/step_2_update_the_database_schema/content_tables.inc.php
+++ b/zenario/admin/db_updates/step_2_update_the_database_schema/content_tables.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/admin/db_updates/step_2_update_the_database_schema/user_tables.inc.php b/zenario/admin/db_updates/step_2_update_the_database_schema/user_tables.inc.php
index ce744124d..aa6a1c606 100644
--- a/zenario/admin/db_updates/step_2_update_the_database_schema/user_tables.inc.php
+++ b/zenario/admin/db_updates/step_2_update_the_database_schema/user_tables.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/admin/db_updates/step_3_populate_certain_tables/document_types.inc.php b/zenario/admin/db_updates/step_3_populate_certain_tables/document_types.inc.php
index cb127c37a..cd195fc7e 100644
--- a/zenario/admin/db_updates/step_3_populate_certain_tables/document_types.inc.php
+++ b/zenario/admin/db_updates/step_3_populate_certain_tables/document_types.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/admin/db_updates/step_3_populate_certain_tables/language_names.inc.php b/zenario/admin/db_updates/step_3_populate_certain_tables/language_names.inc.php
index a1a5f595a..e58f6f258 100644
--- a/zenario/admin/db_updates/step_3_populate_certain_tables/language_names.inc.php
+++ b/zenario/admin/db_updates/step_3_populate_certain_tables/language_names.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/admin/db_updates/step_3_populate_certain_tables/page_preview_sizes.inc.php b/zenario/admin/db_updates/step_3_populate_certain_tables/page_preview_sizes.inc.php
index d04e64931..6e2f2b17b 100644
--- a/zenario/admin/db_updates/step_3_populate_certain_tables/page_preview_sizes.inc.php
+++ b/zenario/admin/db_updates/step_3_populate_certain_tables/page_preview_sizes.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/admin/db_updates/step_4_migrate_the_data/admin_tables.inc.php b/zenario/admin/db_updates/step_4_migrate_the_data/admin_tables.inc.php
index 13cd7724a..b319c5d71 100644
--- a/zenario/admin/db_updates/step_4_migrate_the_data/admin_tables.inc.php
+++ b/zenario/admin/db_updates/step_4_migrate_the_data/admin_tables.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/admin/db_updates/step_4_migrate_the_data/content_tables.inc.php b/zenario/admin/db_updates/step_4_migrate_the_data/content_tables.inc.php
index 1b8cf3b08..e1846dd65 100644
--- a/zenario/admin/db_updates/step_4_migrate_the_data/content_tables.inc.php
+++ b/zenario/admin/db_updates/step_4_migrate_the_data/content_tables.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/admin/db_updates/step_4_migrate_the_data/external_programs.inc.php b/zenario/admin/db_updates/step_4_migrate_the_data/external_programs.inc.php
index eee528362..0133db906 100644
--- a/zenario/admin/db_updates/step_4_migrate_the_data/external_programs.inc.php
+++ b/zenario/admin/db_updates/step_4_migrate_the_data/external_programs.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/admin/db_updates/step_4_migrate_the_data/plugins.inc.php b/zenario/admin/db_updates/step_4_migrate_the_data/plugins.inc.php
index 685403724..35d286be2 100644
--- a/zenario/admin/db_updates/step_4_migrate_the_data/plugins.inc.php
+++ b/zenario/admin/db_updates/step_4_migrate_the_data/plugins.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/admin/db_updates/step_4_migrate_the_data/user_tables.inc.php b/zenario/admin/db_updates/step_4_migrate_the_data/user_tables.inc.php
index af4efcca2..b52c9b27f 100644
--- a/zenario/admin/db_updates/step_4_migrate_the_data/user_tables.inc.php
+++ b/zenario/admin/db_updates/step_4_migrate_the_data/user_tables.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/admin/dev_tools/doc_tools.js b/zenario/admin/dev_tools/doc_tools.js
index 3e6389c52..a7008bb23 100644
--- a/zenario/admin/dev_tools/doc_tools.js
+++ b/zenario/admin/dev_tools/doc_tools.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/admin/layout_preview.php b/zenario/admin/layout_preview.php
index caa35cab1..a0aa36002 100644
--- a/zenario/admin/layout_preview.php
+++ b/zenario/admin/layout_preview.php
@@ -1,6 +1,6 @@
 <?php 
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/admin/organizer.ajax.php b/zenario/admin/organizer.ajax.php
index eed2d88d8..b9c732d44 100644
--- a/zenario/admin/organizer.ajax.php
+++ b/zenario/admin/organizer.ajax.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/admin/quick_ajax.php b/zenario/admin/quick_ajax.php
index 10c2720da..5a87196b4 100644
--- a/zenario/admin/quick_ajax.php
+++ b/zenario/admin/quick_ajax.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/admin/welcome.ajax.php b/zenario/admin/welcome.ajax.php
index 436a9f94c..9d6996d9f 100644
--- a/zenario/admin/welcome.ajax.php
+++ b/zenario/admin/welcome.ajax.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/admin/welcome.php b/zenario/admin/welcome.php
index 04ac541ef..11fa0a387 100644
--- a/zenario/admin/welcome.php
+++ b/zenario/admin/welcome.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -26,12 +26,12 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-if (version_compare(phpversion(), '7.0.0', '<')) {
+if (version_compare(phpversion(), '7.2.0', '<')) {
 	echo '
 		<h1>System Requirements</h1>
 		<p>It looks like your server doesn\'t meet the requirements for Zenario.</p>
 		<p>
-			Zenario needs PHP version 7.0 or later to run (<em>you have version ', htmlspecialchars(phpversion()), '</em>).
+			Zenario needs PHP version 7.2 or later to run (<em>you have version ', htmlspecialchars(phpversion()), '</em>).
 		</p>';
 	exit;
 }
diff --git a/zenario/admin/welcome/diagnostics.yaml b/zenario/admin/welcome/diagnostics.yaml
index 42c8ceaf4..062d20673 100644
--- a/zenario/admin/welcome/diagnostics.yaml
+++ b/zenario/admin/welcome/diagnostics.yaml
@@ -73,7 +73,7 @@ diagnostics:
                     full_width: true
                     row_class: sub_field
                     snippet:
-                        html: PHP version 7.0 or later
+                        html: PHP version 7.2 or later
                     visible_if: zenarioAW.togglePressed(field)
                 opcache_misconfigured:
                     grouping: sub_table
diff --git a/zenario/admin/welcome/system_requirements.yaml b/zenario/admin/welcome/system_requirements.yaml
index 8a2b473eb..b3d4e771b 100644
--- a/zenario/admin/welcome/system_requirements.yaml
+++ b/zenario/admin/welcome/system_requirements.yaml
@@ -49,7 +49,7 @@ system_requirements:
                     grouping: sub_table
                     full_width: true
                     snippet:
-                        html: PHP version 7.0 or later
+                        html: PHP version 7.2 or later
                     visible_if: zenarioAW.togglePressed(field)
                 opcache_misconfigured:
                     grouping: sub_table
diff --git a/zenario/adminheader.inc.php b/zenario/adminheader.inc.php
index 3301bb365..86646954a 100644
--- a/zenario/adminheader.inc.php
+++ b/zenario/adminheader.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/ajax.php b/zenario/ajax.php
index 850355e20..731cdced4 100644
--- a/zenario/ajax.php
+++ b/zenario/ajax.php
@@ -1,6 +1,6 @@
 <?php 
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/admin.php b/zenario/autoload/admin.php
index bcc3e3bb6..f7d2a8512 100644
--- a/zenario/autoload/admin.php
+++ b/zenario/autoload/admin.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -554,7 +554,8 @@ public static function isInactive($adminId) {
 			FROM ' . DB_PREFIX . 'admins
 			WHERE id = ' . (int)$adminId . '
 			AND authtype = "local" 
-			AND COALESCE(last_login, created_date) < DATE_SUB(NOW(), INTERVAL ' . (int)$days . ' DAY)';
+			AND COALESCE(last_login, created_date) < DATE_SUB(NOW(), INTERVAL ' . (int)$days . ' DAY)
+			LIMIT 1';
 		$result = \ze\sql::select($sql);
 		return \ze\sql::numRows($result) > 0;
 	}
diff --git a/zenario/autoload/adminAdm.php b/zenario/autoload/adminAdm.php
index f1208b467..dd36fe62e 100644
--- a/zenario/autoload/adminAdm.php
+++ b/zenario/autoload/adminAdm.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/cache.php b/zenario/autoload/cache.php
index 52a05e933..bbb44eed1 100644
--- a/zenario/autoload/cache.php
+++ b/zenario/autoload/cache.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/category.php b/zenario/autoload/category.php
index eca0a48a9..b32a14348 100644
--- a/zenario/autoload/category.php
+++ b/zenario/autoload/category.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/categoryAdm.php b/zenario/autoload/categoryAdm.php
index b6b772c9d..d3c45ac77 100644
--- a/zenario/autoload/categoryAdm.php
+++ b/zenario/autoload/categoryAdm.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/content.php b/zenario/autoload/content.php
index d2bdc56ec..235b24d2e 100644
--- a/zenario/autoload/content.php
+++ b/zenario/autoload/content.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/contentAdm.php b/zenario/autoload/contentAdm.php
index b9af102dc..1da56546a 100644
--- a/zenario/autoload/contentAdm.php
+++ b/zenario/autoload/contentAdm.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/cookie.php b/zenario/autoload/cookie.php
index 82dff0701..9e434bfcd 100644
--- a/zenario/autoload/cookie.php
+++ b/zenario/autoload/cookie.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/curl.php b/zenario/autoload/curl.php
index bf4fccb83..a79479540 100644
--- a/zenario/autoload/curl.php
+++ b/zenario/autoload/curl.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/dataset.php b/zenario/autoload/dataset.php
index 1a1624eee..78960d08c 100644
--- a/zenario/autoload/dataset.php
+++ b/zenario/autoload/dataset.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/datasetAdm.php b/zenario/autoload/datasetAdm.php
index 23140d8dd..a08a3aec0 100644
--- a/zenario/autoload/datasetAdm.php
+++ b/zenario/autoload/datasetAdm.php
@@ -1,6 +1,6 @@
 <?php 
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/date.php b/zenario/autoload/date.php
index 54f0959f0..1bc68057a 100644
--- a/zenario/autoload/date.php
+++ b/zenario/autoload/date.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/db.php b/zenario/autoload/db.php
index d10bfb061..73f69c2ce 100644
--- a/zenario/autoload/db.php
+++ b/zenario/autoload/db.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -599,7 +599,7 @@ public static function updateDataRevisionNumber2() {
 
 
 	//Formerly "connectToDatabase()"
-	public static function connect($dbhost = 'localhost', $dbname, $dbuser, $dbpass, $dbport = '', $reportErrors = true) {
+	public static function connect($dbhost, $dbname, $dbuser, $dbpass, $dbport = '', $reportErrors = true) {
 		try {
 			\ze::ignoreErrors();
 				if ($dbport) {
diff --git a/zenario/autoload/dbAdm.php b/zenario/autoload/dbAdm.php
index af77c5112..c7cd118a2 100644
--- a/zenario/autoload/dbAdm.php
+++ b/zenario/autoload/dbAdm.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/deprecated.php b/zenario/autoload/deprecated.php
index 19860b8ea..6ba614a7d 100644
--- a/zenario/autoload/deprecated.php
+++ b/zenario/autoload/deprecated.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/document.php b/zenario/autoload/document.php
index 57983e115..3ff4c649d 100644
--- a/zenario/autoload/document.php
+++ b/zenario/autoload/document.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/error.php b/zenario/autoload/error.php
index 8e302a823..343975e40 100644
--- a/zenario/autoload/error.php
+++ b/zenario/autoload/error.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/escape.php b/zenario/autoload/escape.php
index 39079e1e3..fd4c86849 100644
--- a/zenario/autoload/escape.php
+++ b/zenario/autoload/escape.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/file.php b/zenario/autoload/file.php
index dab56ac78..560901a76 100644
--- a/zenario/autoload/file.php
+++ b/zenario/autoload/file.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -1054,17 +1054,23 @@ public static function imageLink(
 				//We'll try to create a subdirectory inside public/images/ using the short checksum as the name
 				$path = \ze\cache::createDir($image['short_checksum'], 'public/images', false);
 			
-				//If this is a resize, we'll put the resize in another subdirectory using the code above as the name
-				if ($path && $imageNeedsToBeResized) {
+				//If this is a resize, we'll put the resize in another subdirectory using the code above as the name.
+				//(Note: Except for SVGs which are vector images and don't need resizing.)
+				if ($path && $imageNeedsToBeResized && !$isSVG) {
 					$path = \ze\cache::createDir($image['short_checksum']. '/'. $settingCode, 'public/images', false);
 				}
 		
 			//If the image should be in the private directory, don't worry about a friendly URL and
 			//just use the full hash.
 			} else {
-				//Workout a hash for the image at this size
-				$hash = \ze::hash64($settingCode. '_'. $image['checksum']);
-			
+				//Workout a hash for the image at this size.
+				//Except for SVGs, the hash should also include the resize parameters
+				if ($isSVG) {
+					$hash = $image['checksum'];
+				} else {
+					$hash = \ze::hash64($settingCode. '_'. $image['checksum']);
+				}			
+				
 				//Try to get a directory in the cache dir
 				$path = \ze\cache::createDir($hash, 'images', false);
 			}
diff --git a/zenario/autoload/fileAdm.php b/zenario/autoload/fileAdm.php
index a18b16d7c..3bde94b90 100644
--- a/zenario/autoload/fileAdm.php
+++ b/zenario/autoload/fileAdm.php
@@ -1,6 +1,6 @@
 <?php 
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/fun/addNeededSpecialPages.php b/zenario/autoload/fun/addNeededSpecialPages.php
index f833c8ccb..380e86712 100644
--- a/zenario/autoload/fun/addNeededSpecialPages.php
+++ b/zenario/autoload/fun/addNeededSpecialPages.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/fun/cache.php b/zenario/autoload/fun/cache.php
index 173001d24..ffda7120a 100644
--- a/zenario/autoload/fun/cache.php
+++ b/zenario/autoload/fun/cache.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/fun/checkPassword.php b/zenario/autoload/fun/checkPassword.php
index 3a9c7347d..88df5364d 100644
--- a/zenario/autoload/fun/checkPassword.php
+++ b/zenario/autoload/fun/checkPassword.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/fun/checkSlotsWereUsed.php b/zenario/autoload/fun/checkSlotsWereUsed.php
index 2b432bebc..13bf9217c 100644
--- a/zenario/autoload/fun/checkSlotsWereUsed.php
+++ b/zenario/autoload/fun/checkSlotsWereUsed.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/fun/cleanDirs.php b/zenario/autoload/fun/cleanDirs.php
index 5fc3bbf92..5c8b3d574 100644
--- a/zenario/autoload/fun/cleanDirs.php
+++ b/zenario/autoload/fun/cleanDirs.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/fun/clearCache.php b/zenario/autoload/fun/clearCache.php
index f92944290..fb39cb0ad 100644
--- a/zenario/autoload/fun/clearCache.php
+++ b/zenario/autoload/fun/clearCache.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/fun/createBackupScript.php b/zenario/autoload/fun/createBackupScript.php
index d1af23032..164d100f2 100644
--- a/zenario/autoload/fun/createBackupScript.php
+++ b/zenario/autoload/fun/createBackupScript.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/fun/createDraft.php b/zenario/autoload/fun/createDraft.php
index f6e71ad35..e59e744f5 100644
--- a/zenario/autoload/fun/createDraft.php
+++ b/zenario/autoload/fun/createDraft.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/fun/getAdminPhraseCode.php b/zenario/autoload/fun/getAdminPhraseCode.php
index 0f3ea8b62..5274d37b9 100644
--- a/zenario/autoload/fun/getAdminPhraseCode.php
+++ b/zenario/autoload/fun/getAdminPhraseCode.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/fun/getSmartGroupDescription.php b/zenario/autoload/fun/getSmartGroupDescription.php
index 3f9c17308..a2b9f9e67 100644
--- a/zenario/autoload/fun/getSmartGroupDescription.php
+++ b/zenario/autoload/fun/getSmartGroupDescription.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/fun/importVisitorLanguagePack.php b/zenario/autoload/fun/importVisitorLanguagePack.php
index 6e3b516c1..38734d7be 100644
--- a/zenario/autoload/fun/importVisitorLanguagePack.php
+++ b/zenario/autoload/fun/importVisitorLanguagePack.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/fun/modules.php b/zenario/autoload/fun/modules.php
index 7b02a163d..f020c4eb7 100644
--- a/zenario/autoload/fun/modules.php
+++ b/zenario/autoload/fun/modules.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/fun/modulesAndTUIXFiles.php b/zenario/autoload/fun/modulesAndTUIXFiles.php
index baaac3b61..d8b5036d8 100644
--- a/zenario/autoload/fun/modulesAndTUIXFiles.php
+++ b/zenario/autoload/fun/modulesAndTUIXFiles.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/fun/pageBody.php b/zenario/autoload/fun/pageBody.php
index 1bd13b8c6..c59d23f76 100644
--- a/zenario/autoload/fun/pageBody.php
+++ b/zenario/autoload/fun/pageBody.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/fun/pageBodyAdminClass.php b/zenario/autoload/fun/pageBodyAdminClass.php
index b8f272bdb..752ec23bb 100644
--- a/zenario/autoload/fun/pageBodyAdminClass.php
+++ b/zenario/autoload/fun/pageBodyAdminClass.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/fun/pageBodyAdminToolbar.php b/zenario/autoload/fun/pageBodyAdminToolbar.php
index f8fb2dbb8..da3f94c82 100644
--- a/zenario/autoload/fun/pageBodyAdminToolbar.php
+++ b/zenario/autoload/fun/pageBodyAdminToolbar.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/fun/pageFoot.php b/zenario/autoload/fun/pageFoot.php
index 1cb4b015e..49f54e9d1 100644
--- a/zenario/autoload/fun/pageFoot.php
+++ b/zenario/autoload/fun/pageFoot.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -129,26 +129,22 @@
 }
 
 
-$checkPrefixes = $prefix != 'zenario/';
-
 foreach (\ze::$jsLibs as $lib => $stylesheet) {
 	
 	if ($stylesheet) {
-		if ($checkPrefixes) {
-			if ($stylesheet[0] != '/'
-			 && strpos($stylesheet, '://') === false) {
-				$stylesheet = $prefix. '../'. $stylesheet;
-			}
+		$thisPrefix = '';
+		if ($stylesheet[0] != '/'
+		 && strpos($stylesheet, '://') === false) {
+			$thisPrefix = $absURL;
 		}
-		echo "\n", '<link rel="stylesheet" type="text/css" media="screen" href="', $prefix, htmlspecialchars($stylesheet). '?', $v, '"/>';
+		
+		echo "\n", '<link rel="stylesheet" type="text/css" media="screen" href="', $thisPrefix, htmlspecialchars($stylesheet). '?', $v, '"/>';
 	}
 	
+	$thisPrefix = '';
 	if ($lib[0] != '/'
 	 && strpos($lib, '://') === false) {
-		
-		if ($checkPrefixes) {
-			$lib = $prefix. '../'. $lib;
-		}
+		$thisPrefix = $absURL;
 		
 		if (strpos($lib, '?v=') === false
 		 && strpos($lib, '&v=') === false) {
@@ -159,7 +155,7 @@
 			}
 		}
 	}
-	echo "\n", $scriptTag, ' src="', htmlspecialchars($lib), '"></script>';
+	echo "\n", $scriptTag, ' src="', $thisPrefix, htmlspecialchars($lib), '"></script>';
 }
 	
 
@@ -330,7 +326,7 @@
 
 //Check to see if there is anything we need to output from the head/foot slots.
 //We need to pay attention to the logic for showing to admins, cookie consent, and overriding
-if (\ze::$cID) {
+if (\ze::$cID && \ze::$cID !== -1) {
 	$itemHTML = $templateHTML = $familyHTML = false;
 	
 	$sql = "
diff --git a/zenario/autoload/fun/pageFootInAdminMode.php b/zenario/autoload/fun/pageFootInAdminMode.php
index e35a5f781..b71154bdf 100644
--- a/zenario/autoload/fun/pageFootInAdminMode.php
+++ b/zenario/autoload/fun/pageFootInAdminMode.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/fun/pageHead.php b/zenario/autoload/fun/pageHead.php
index 07918794e..c79c97271 100644
--- a/zenario/autoload/fun/pageHead.php
+++ b/zenario/autoload/fun/pageHead.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -298,7 +298,7 @@
 }
 
 
-if (\ze::$cID) {
+if (\ze::$cID && \ze::$cID !== -1) {
 	$itemHTML = $templateHTML = $familyHTML =
 	$bgWidth = $bgHeight = $bgURL = false;
 	
diff --git a/zenario/autoload/fun/processRules.php b/zenario/autoload/fun/processRules.php
index 151f2930f..3dce4cf33 100644
--- a/zenario/autoload/fun/processRules.php
+++ b/zenario/autoload/fun/processRules.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/fun/redirectToPage.php b/zenario/autoload/fun/redirectToPage.php
index beff21538..61bad3c8d 100644
--- a/zenario/autoload/fun/redirectToPage.php
+++ b/zenario/autoload/fun/redirectToPage.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/fun/rerenderWorkingCopyImages.php b/zenario/autoload/fun/rerenderWorkingCopyImages.php
index 382c5b5da..ed87d0ea5 100644
--- a/zenario/autoload/fun/rerenderWorkingCopyImages.php
+++ b/zenario/autoload/fun/rerenderWorkingCopyImages.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/fun/restoreFromBackup.php b/zenario/autoload/fun/restoreFromBackup.php
index e8255c557..fb956bc8b 100644
--- a/zenario/autoload/fun/restoreFromBackup.php
+++ b/zenario/autoload/fun/restoreFromBackup.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/fun/setSession.php b/zenario/autoload/fun/setSession.php
index 55259143e..7ca233e6f 100644
--- a/zenario/autoload/fun/setSession.php
+++ b/zenario/autoload/fun/setSession.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/fun/setupSlotControls.php b/zenario/autoload/fun/setupSlotControls.php
index f0a5f2c0c..b5c505903 100644
--- a/zenario/autoload/fun/setupSlotControls.php
+++ b/zenario/autoload/fun/setupSlotControls.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/fun/showConsentBox.php b/zenario/autoload/fun/showConsentBox.php
index 54e933f20..0477178eb 100644
--- a/zenario/autoload/fun/showConsentBox.php
+++ b/zenario/autoload/fun/showConsentBox.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/fun/showHideImageOptions.php b/zenario/autoload/fun/showHideImageOptions.php
index 614a2e365..1bfd25cc3 100644
--- a/zenario/autoload/fun/showHideImageOptions.php
+++ b/zenario/autoload/fun/showHideImageOptions.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/fun/showStartSitePageIfNeeded.php b/zenario/autoload/fun/showStartSitePageIfNeeded.php
index cfe873fb3..caba9367c 100644
--- a/zenario/autoload/fun/showStartSitePageIfNeeded.php
+++ b/zenario/autoload/fun/showStartSitePageIfNeeded.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/fun/sql.php b/zenario/autoload/fun/sql.php
index 997940247..031c209a9 100644
--- a/zenario/autoload/fun/sql.php
+++ b/zenario/autoload/fun/sql.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/fun/startIncludeAdminControls.php b/zenario/autoload/fun/startIncludeAdminControls.php
index f9efbc904..a8c70e85e 100644
--- a/zenario/autoload/fun/startIncludeAdminControls.php
+++ b/zenario/autoload/fun/startIncludeAdminControls.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/fun/syncInlineFileContentLink.php b/zenario/autoload/fun/syncInlineFileContentLink.php
index 344b2542b..35cbe8a92 100644
--- a/zenario/autoload/fun/syncInlineFileContentLink.php
+++ b/zenario/autoload/fun/syncInlineFileContentLink.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/fun/syncInlineFileLinks.php b/zenario/autoload/fun/syncInlineFileLinks.php
index 78f7762be..b1b12f966 100644
--- a/zenario/autoload/fun/syncInlineFileLinks.php
+++ b/zenario/autoload/fun/syncInlineFileLinks.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/fun/syncSuperAdmin.php b/zenario/autoload/fun/syncSuperAdmin.php
index be9019c52..aeed1fa4d 100644
--- a/zenario/autoload/fun/syncSuperAdmin.php
+++ b/zenario/autoload/fun/syncSuperAdmin.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/fun/zAPIFrameworkField.php b/zenario/autoload/fun/zAPIFrameworkField.php
index 2e3a520aa..6a4744d72 100644
--- a/zenario/autoload/fun/zAPIFrameworkField.php
+++ b/zenario/autoload/fun/zAPIFrameworkField.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/gridAdm.php b/zenario/autoload/gridAdm.php
index a2ba0684f..68c4adcb2 100644
--- a/zenario/autoload/gridAdm.php
+++ b/zenario/autoload/gridAdm.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/lang.php b/zenario/autoload/lang.php
index 38273dd93..941b78a55 100644
--- a/zenario/autoload/lang.php
+++ b/zenario/autoload/lang.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/layoutAdm.php b/zenario/autoload/layoutAdm.php
index 2f4852e69..988eb192b 100644
--- a/zenario/autoload/layoutAdm.php
+++ b/zenario/autoload/layoutAdm.php
@@ -1,6 +1,6 @@
 <?php 
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/link.php b/zenario/autoload/link.php
index 00f9820ab..c02fe27f8 100644
--- a/zenario/autoload/link.php
+++ b/zenario/autoload/link.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/menu.php b/zenario/autoload/menu.php
index d102cc2e1..89170dd54 100644
--- a/zenario/autoload/menu.php
+++ b/zenario/autoload/menu.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/menuAdm.php b/zenario/autoload/menuAdm.php
index 1e4573a9c..6c7a3de13 100644
--- a/zenario/autoload/menuAdm.php
+++ b/zenario/autoload/menuAdm.php
@@ -1,6 +1,6 @@
 <?php 
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/miscAdm.php b/zenario/autoload/miscAdm.php
index 88d7b6115..5ca085803 100644
--- a/zenario/autoload/miscAdm.php
+++ b/zenario/autoload/miscAdm.php
@@ -1,6 +1,6 @@
 <?php 
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -1252,7 +1252,10 @@ public static function saveSystemFieldsFromTUIX($datasetId) {
 										[
 											'dataset_id' => $datasetId, 
 											'tab_name' => $tabName, 
-											'field_name' => $fieldName]);
+											'field_name' => $fieldName
+										],
+										$ignore = false, $ignoreMissingColumns = true
+									);
 								}
 							}
 						}
diff --git a/zenario/autoload/module.php b/zenario/autoload/module.php
index 69798f8b2..9832894e5 100644
--- a/zenario/autoload/module.php
+++ b/zenario/autoload/module.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/moduleAdm.php b/zenario/autoload/moduleAdm.php
index 116e1f568..f15a1c82b 100644
--- a/zenario/autoload/moduleAdm.php
+++ b/zenario/autoload/moduleAdm.php
@@ -1,6 +1,6 @@
 <?php 
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/moduleBaseClass.php b/zenario/autoload/moduleBaseClass.php
index 99f77072e..856d3b7ec 100644
--- a/zenario/autoload/moduleBaseClass.php
+++ b/zenario/autoload/moduleBaseClass.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -671,11 +671,13 @@ protected final function registerPluginPage($mode = null, $moduleClassName = nul
 			}
 			
 			\ze\row::set('plugin_pages_by_mode',
-				['equiv_id' => \ze::$equivId, 'content_type' => \ze::$cType],
 				[
-					'module_class_name' => $moduleClassName ?? $this->moduleClassName,
-					'mode' => $mode ?? ($this->setting('mode') ?: ''),
+					'equiv_id' => \ze::$equivId,
+					'content_type' => \ze::$cType,
 					'state' => substr(\ze\escape::ascii($state), 0, 2)
+				], [
+					'module_class_name' => $moduleClassName ?? $this->moduleClassName,
+					'mode' => $mode ?? ($this->setting('mode') ?: '')
 				]
 			);
 		}
@@ -1340,7 +1342,7 @@ public final function start($awClass = 'zenario_slotOuter') {
 	}
 	
 	//Display the admin controls for a slot
-	private final function startIncludeAdminControls() {
+	private function startIncludeAdminControls() {
 		require \ze::funIncPath(__FILE__, __FUNCTION__);
 	}
 	
@@ -1564,11 +1566,11 @@ public final function frameworkField($attributes) {
 		return $this->zAPIFrameworkField($attributes);
 	}
 	
-	private final function zAPIFrameworkField($attributes, $i = false, $lov = false, $readonly = false, $saveVal = null, $dispVal = null) {
+	private function zAPIFrameworkField($attributes, $i = false, $lov = false, $readonly = false, $saveVal = null, $dispVal = null) {
 		return require \ze::funIncPath(__FILE__, __FUNCTION__);
 	}
 	
-	private final function zAPIFrameworkLOV($type, &$attributes, &$lov) {
+	private function zAPIFrameworkLOV($type, &$attributes, &$lov) {
 		//Load the List of Values for a field
 		if ($type == 'checkbox' || $type == 'radio' || $type == 'select' || $type == 'toggle' || $type == 'text') {
 			if (!empty($attributes['source_module']) && !empty($attributes['source_method']) && \ze\module::inc($attributes['source_module'])) {
diff --git a/zenario/autoload/pageCache.php b/zenario/autoload/pageCache.php
index 56c82a16d..412222635 100644
--- a/zenario/autoload/pageCache.php
+++ b/zenario/autoload/pageCache.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/phi.php b/zenario/autoload/phi.php
index 731d49647..19dd8a0cd 100644
--- a/zenario/autoload/phi.php
+++ b/zenario/autoload/phi.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/phiParser.php b/zenario/autoload/phiParser.php
index d1fde7d1a..8c41a971e 100644
--- a/zenario/autoload/phiParser.php
+++ b/zenario/autoload/phiParser.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/phraseAdm.php b/zenario/autoload/phraseAdm.php
index 5e4177aa0..2a12aff72 100644
--- a/zenario/autoload/phraseAdm.php
+++ b/zenario/autoload/phraseAdm.php
@@ -1,6 +1,6 @@
 <?php 
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/plugin.php b/zenario/autoload/plugin.php
index ae8c4cd7d..3890083d5 100644
--- a/zenario/autoload/plugin.php
+++ b/zenario/autoload/plugin.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/pluginAdm.php b/zenario/autoload/pluginAdm.php
index 1ec1b97fc..0d5d1fc2a 100644
--- a/zenario/autoload/pluginAdm.php
+++ b/zenario/autoload/pluginAdm.php
@@ -1,6 +1,6 @@
 <?php 
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -890,7 +890,7 @@ public static function getUsage($instanceId) {
 
 	//Replace one instance with another
 	//Formerly "replacePluginInstance()"
-	public static function replace($oldmoduleId = false, $oldInstanceId, $newmoduleId = false, $newInstanceId, $cID = false, $cType = false, $cVersion = false, $slotName = false) {
+	public static function replace($oldmoduleId, $oldInstanceId, $newmoduleId, $newInstanceId, $cID = false, $cType = false, $cVersion = false, $slotName = false) {
 	
 		if ((!$oldmoduleId && !($oldmoduleId = \ze\row::get('plugin_instances', 'module_id', $oldInstanceId)))
 		 || (!$newmoduleId && !($newmoduleId = \ze\row::get('plugin_instances', 'module_id', $newInstanceId)))) {
@@ -1000,7 +1000,7 @@ public static function delete($instanceId) {
 			   ON gsl.link_from = 'slide'
 			  AND gsl.link_from_id = np.id
 			  AND np.is_slide = 1
-			WHERE np.instance_id = ". $instanceId);
+			WHERE np.instance_id = ". (int) $instanceId);
 	
 		foreach ([
 			'nested_paths', 'plugin_instance_store',
@@ -1061,7 +1061,7 @@ public static function updateItemSlot($instanceId, $slotName, $cID, $cType = fal
 	
 
 	//Formerly "updatePluginInstanceInTemplateSlot()"
-	public static function updateLayoutSlot($instanceId, $slotName, $templateFamily = false, $layoutId, $moduleId = false, $cID = false, $cType = false, $cVersion = false, $copySwatchUp = false, $copySwatchDown = false) {
+	public static function updateLayoutSlot($instanceId, $slotName, $templateFamily, $layoutId, $moduleId = false, $cID = false, $cType = false, $cVersion = false, $copySwatchUp = false, $copySwatchDown = false) {
 	
 		if ($cID && $cType && !$cVersion) {
 			$cVersion = \ze\content::latestVersion($cID, $cType);
diff --git a/zenario/autoload/priv.php b/zenario/autoload/priv.php
index 2025586db..67e70e9d4 100644
--- a/zenario/autoload/priv.php
+++ b/zenario/autoload/priv.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/ray.php b/zenario/autoload/ray.php
index 2e1af2433..b449dacdd 100644
--- a/zenario/autoload/ray.php
+++ b/zenario/autoload/ray.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/ring.php b/zenario/autoload/ring.php
index d20cfd261..00f9e7732 100644
--- a/zenario/autoload/ring.php
+++ b/zenario/autoload/ring.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/row-da.php b/zenario/autoload/row-da.php
index 467bc1463..874815ebf 100644
--- a/zenario/autoload/row-da.php
+++ b/zenario/autoload/row-da.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/row-g.php b/zenario/autoload/row-g.php
index 2c91149df..3ff090f5d 100644
--- a/zenario/autoload/row-g.php
+++ b/zenario/autoload/row-g.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/row.php b/zenario/autoload/row.php
index 451100359..2abad19a8 100644
--- a/zenario/autoload/row.php
+++ b/zenario/autoload/row.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/server.php b/zenario/autoload/server.php
index c3020aaa0..c9c82f072 100644
--- a/zenario/autoload/server.php
+++ b/zenario/autoload/server.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/site.php b/zenario/autoload/site.php
index 57e321d61..00f84d273 100644
--- a/zenario/autoload/site.php
+++ b/zenario/autoload/site.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/skinAdm.php b/zenario/autoload/skinAdm.php
index 0c4bd4be8..3847a0abd 100644
--- a/zenario/autoload/skinAdm.php
+++ b/zenario/autoload/skinAdm.php
@@ -1,6 +1,6 @@
 <?php 
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/smartGroup.php b/zenario/autoload/smartGroup.php
index 090aba413..5b33f10c9 100644
--- a/zenario/autoload/smartGroup.php
+++ b/zenario/autoload/smartGroup.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/sql-da.php b/zenario/autoload/sql-da.php
index c7f0f9c99..602d85f19 100644
--- a/zenario/autoload/sql-da.php
+++ b/zenario/autoload/sql-da.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/sql-g.php b/zenario/autoload/sql-g.php
index f6454b213..1aacda22a 100644
--- a/zenario/autoload/sql-g.php
+++ b/zenario/autoload/sql-g.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/sql.php b/zenario/autoload/sql.php
index 9b55925c8..cea6e7c7e 100644
--- a/zenario/autoload/sql.php
+++ b/zenario/autoload/sql.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/tuix.php b/zenario/autoload/tuix.php
index 68197cae1..323b3bd1d 100644
--- a/zenario/autoload/tuix.php
+++ b/zenario/autoload/tuix.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/twig.php b/zenario/autoload/twig.php
index f5b7158a1..49b5277ca 100644
--- a/zenario/autoload/twig.php
+++ b/zenario/autoload/twig.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/user.php b/zenario/autoload/user.php
index 5f4a3a518..bebde1794 100644
--- a/zenario/autoload/user.php
+++ b/zenario/autoload/user.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/userAdm.php b/zenario/autoload/userAdm.php
index 787598aa6..95084ef17 100644
--- a/zenario/autoload/userAdm.php
+++ b/zenario/autoload/userAdm.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/autoload/welcome.php b/zenario/autoload/welcome.php
index a0ff5755d..b2941a5f0 100644
--- a/zenario/autoload/welcome.php
+++ b/zenario/autoload/welcome.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -103,7 +103,7 @@ public static function quickValidateWelcomePage(&$values, &$rowClasses, &$snippe
 	//This file includes common functionality for running SQL scripts
 
 	//Formerly "runSQL()"
-	public static function runSQL($prefix = false, $file, &$error, $patterns = false, $replacements = false) {
+	public static function runSQL($prefix, $file, &$error, $patterns = false, $replacements = false) {
 		
 		\ze\dbAdm::getTableEngine();
 		$error = false;
@@ -440,7 +440,7 @@ public static function systemRequirementsAJAX(&$source, &$tags, &$fields, &$valu
 		$fields['0/php_1']['post_field_html'] =
 			\ze\admin::phrase('&nbsp;(<em>you have version [[version]]</em>)', ['version' => htmlspecialchars($phpVersion)]);
 	
-		if (!\ze\welcome::compareVersionNumber($phpVersion, '7.0.0')) {
+		if (!\ze\welcome::compareVersionNumber($phpVersion, '7.2.0')) {
 			$fields['0/php_1']['row_class'] = $invalid;
 	
 		} else {
@@ -450,7 +450,7 @@ public static function systemRequirementsAJAX(&$source, &$tags, &$fields, &$valu
 	
 		$phpWarning = false;
 		if (!$fields['0/opcache_misconfigured']['hidden'] =
-			\ze\welcome::compareVersionNumber(phpversion(), '7.0.0')
+			\ze\welcome::compareVersionNumber(phpversion(), '7.2.0')
 		 || !\ze\server::checkFunctionEnabled('ini_get')
 		 || !\ze\ring::engToBoolean(ini_get('opcache.enable'))
 		 || \ze\ring::engToBoolean(ini_get('opcache.dups_fix'))
@@ -957,45 +957,21 @@ public static function installerAJAX(&$source, &$tags, &$fields, &$values, $chan
 			}
 		
 			if (empty($tags['tabs'][3]['errors'])) {
-				
-				if($values['3/multi_db'] == 'zenario_multisite')
-				{
-					
-				\ze::$dbG = new \ze\db($merge['DB_PREFIX_GLOBAL'], $merge['DBHOST_GLOBAL'], $merge['DBNAME_GLOBAL'], $merge['DBUSER_GLOBAL'], $merge['DBPASS_GLOBAL'], $merge['DBPORT_GLOBAL'],$reportErrors = false);
-				}
 			
 				\ze::$dbL = new \ze\db($merge['DB_PREFIX'], $merge['DBHOST'], $merge['DBNAME'], $merge['DBUSER'], $merge['DBPASS'], $merge['DBPORT'], $reportErrors = false);
 				
-				if (!\ze::$dbL->con || !\ze::$dbG->con) {
-					if (!\ze::$dbL->con )
-					{
-						\ze::$dbL = null;
-						$tags['tabs'][3]['errors'][] = 
-							\ze\admin::phrase('The database name, username and/or password are invalid.');
-					}
-					elseif (!\ze::$dbG->con && $values['3/multi_db'] == 'zenario_multisite')
-					{
-						\ze::$dbG = null;
-						$tags['tabs'][3]['errors'][] = 
-							\ze\admin::phrase('The database name, username and/or password are invalid for the global database.');
-					}
-				} 
-				if (\ze::$dbL->con ) {	
-				
-				// Check for MySQL max_packet_size being too small
+				if (\ze::$dbL && \ze::$dbL->con) {
+					// Check for MySQL max_packet_size being too small
 					if (($result = @\ze\sql::select("SHOW VARIABLES LIKE 'max_allowed_packet'"))
 					 && ($row = \ze\sql::fetchRow($result))
 					 && !empty($row[1])) {
+						
 						$max_allowed_packet = $row[1];
-						if($max_allowed_packet < 4000000 )
-						{
-							
+						if ($max_allowed_packet < 4000000) {
 							$tags['tabs'][3]['errors'][] =
-								\ze\admin::phrase('Your MySQL server\'s max_packet_size variable is set to '.$max_allowed_packet.', we recommend you increase this to 16MB (must be at least 4MB). Without this, you may experience problems when uploading large images or other files.');
-							
+								\ze\admin::phrase('Your MySQL server\'s max_packet_size variable is set to [[max_allowed_packet]], we recommend you increase this to 16MB (must be at least 4MB). Without this, you may experience problems when uploading large images or other files.',
+									['max_allowed_packet' => $max_allowed_packet]);
 						}
-					
-						
 					}
 				
 					if (!($result = @\ze\sql::select("SELECT VERSION()"))
@@ -1025,23 +1001,25 @@ public static function installerAJAX(&$source, &$tags, &$fields, &$values, $chan
 						}
 					}
 					
-				}
-				//Check admins table for global database
-				if (\ze::$dbG
-				 && \ze::$dbG->con
-				 && $values['3/multi_db'] == 'zenario_multisite') {
-						
-						$tablename = $merge['DB_PREFIX_GLOBAL'].'admins';
-
-						$tables = \ze::$dbG->checkTableDef($tablename, true);
-
-						if(!$tables)
-						{
-							$tags['tabs'][3]['errors'][] = \ze\admin::phrase('Connection to the global database succeeded, but the "admins" table (prefixed with your given prefix) does not appear to exist.');
+					if ($values['3/multi_db'] == 'zenario_multisite') {
+						\ze::$dbG = new \ze\db($merge['DB_PREFIX_GLOBAL'], $merge['DBHOST_GLOBAL'], $merge['DBNAME_GLOBAL'], $merge['DBUSER_GLOBAL'], $merge['DBPASS_GLOBAL'], $merge['DBPORT_GLOBAL'],$reportErrors = false);
+					
+						if (\ze::$dbG && \ze::$dbG->con) {
+							if (!\ze::$dbG->checkTableDef($merge['DB_PREFIX_GLOBAL']. 'admins', true)) {
+								$tags['tabs'][3]['errors'][] =
+									\ze\admin::phrase('Connection to the global database succeeded, but the "admins" table (prefixed with your given prefix) does not appear to exist.');
+							}
+						} else {
+							\ze::$dbG = null;
+							$tags['tabs'][3]['errors'][] = 
+								\ze\admin::phrase('The database name, username and/or password are invalid for the global database.');
 						}
-						
-				}
-				
+					}
+				} else {
+					\ze::$dbL = null;
+					$tags['tabs'][3]['errors'][] = 
+						\ze\admin::phrase('The database name, username and/or password are invalid.');
+				} 
 			}
 			
 		}
@@ -2398,7 +2376,7 @@ public static function diagnosticsAJAX(&$source, &$tags, &$fields, &$values, $ch
 				$sql = '
 					SELECT id, username, last_login, last_login_ip, created_date
 					FROM ' . DB_PREFIX . 'admins
-					WHERE id = '.$admiId.'
+					WHERE id = '. (int) $admiId. '
 					  AND `status` = \'active\'
 					ORDER BY last_login';
 				$result = \ze\sql::select($sql);		
diff --git a/zenario/autoload/wrapper.php b/zenario/autoload/wrapper.php
index df0deb741..73ab47f7d 100644
--- a/zenario/autoload/wrapper.php
+++ b/zenario/autoload/wrapper.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/basicheader.inc.php b/zenario/basicheader.inc.php
index 21af5b44e..a23960b29 100644
--- a/zenario/basicheader.inc.php
+++ b/zenario/basicheader.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/cookie_message.php b/zenario/cookie_message.php
index 56ee0aa4e..44171c5a5 100644
--- a/zenario/cookie_message.php
+++ b/zenario/cookie_message.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/cookies.php b/zenario/cookies.php
index 7c21eaaf7..0377a6348 100644
--- a/zenario/cookies.php
+++ b/zenario/cookies.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/editions.inc.php b/zenario/editions.inc.php
index b7f6e83c5..72cc02b78 100644
--- a/zenario/editions.inc.php
+++ b/zenario/editions.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/file.php b/zenario/file.php
index 5e1981fb0..f9ec73d77 100644
--- a/zenario/file.php
+++ b/zenario/file.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -27,16 +27,27 @@
  */
 
 //Get the checksum and intended usage of this file from the request
-$usage = isset($_GET['usage'])? $_GET['usage'] : 'image';
-$checksum = isset($_GET['checksum'])? $_GET['checksum'] : (isset($_GET['c'])? $_GET['c'] : false);
 $requestedWidth = isset($_GET['width'])? (int) $_GET['width'] : '';
 $requestedHeight = isset($_GET['height'])? (int) $_GET['height'] : '';
 $retina = !empty($_GET['retina']);
-$key = isset($_GET['k'])? $_GET['k'] : '';
 $adminBackend = false;
 
-if ($checksum !== false) {
-	$checksum = preg_replace('/[^\\w-]/', '', $checksum);
+if (isset($_GET['checksum'])) {
+	$checksum = preg_replace('@[^\w\-\=]@', '', $_GET['checksum']);
+} elseif (isset($_GET['c'])) {
+	$checksum = preg_replace('@[^\w\-\=]@', '', $_GET['c']);
+} else {
+	$checksum = '';
+}
+if (isset($_GET['usage'])) {
+	$usage = preg_replace('@[^\w\-\=]@', '', $_GET['usage']);
+} else {
+	$usage = 'image';
+}
+if (isset($_GET['k'])) {
+	$key = preg_replace('@[^\w\-\=]@', '', $_GET['k']);
+} else {
+	$key = '';
 }
 
 //Add some logic to handle any old links to email/inline/menu images (these are now just classed as "image"s).
diff --git a/zenario/has_database_changed_and_is_cache_out_of_date.php b/zenario/has_database_changed_and_is_cache_out_of_date.php
index 1f908a92b..b99b45be5 100644
--- a/zenario/has_database_changed_and_is_cache_out_of_date.php
+++ b/zenario/has_database_changed_and_is_cache_out_of_date.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/includes/ajax.post_display.inc.php b/zenario/includes/ajax.post_display.inc.php
index 9a72d5b7e..fa077a607 100644
--- a/zenario/includes/ajax.post_display.inc.php
+++ b/zenario/includes/ajax.post_display.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/includes/ajax.pre_load.inc.php b/zenario/includes/ajax.pre_load.inc.php
index 852f7e8e8..88d476749 100644
--- a/zenario/includes/ajax.pre_load.inc.php
+++ b/zenario/includes/ajax.pre_load.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/includes/index.post_display.inc.php b/zenario/includes/index.post_display.inc.php
index a16653266..e5847089f 100644
--- a/zenario/includes/index.post_display.inc.php
+++ b/zenario/includes/index.post_display.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/includes/index.pre_load.inc.php b/zenario/includes/index.pre_load.inc.php
index 6696c2ae1..d0429f030 100644
--- a/zenario/includes/index.pre_load.inc.php
+++ b/zenario/includes/index.pre_load.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/includes/js_minify.inc.php b/zenario/includes/js_minify.inc.php
index 0e9523af2..cee9db7d1 100644
--- a/zenario/includes/js_minify.inc.php
+++ b/zenario/includes/js_minify.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/includes/twig.inc.php b/zenario/includes/twig.inc.php
index 0145e2c96..cb092b6ab 100644
--- a/zenario/includes/twig.inc.php
+++ b/zenario/includes/twig.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/includes/wrapper.post_display.inc.php b/zenario/includes/wrapper.post_display.inc.php
index 8d98bcf85..9a1572f19 100644
--- a/zenario/includes/wrapper.post_display.inc.php
+++ b/zenario/includes/wrapper.post_display.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/includes/wrapper.pre_load.inc.php b/zenario/includes/wrapper.pre_load.inc.php
index 3bff7a900..d855b5fdf 100644
--- a/zenario/includes/wrapper.pre_load.inc.php
+++ b/zenario/includes/wrapper.pre_load.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/index.php b/zenario/index.php
index ec8578023..77a1929b8 100644
--- a/zenario/index.php
+++ b/zenario/index.php
@@ -1,6 +1,6 @@
 <?php 
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -169,7 +169,11 @@ function slot($slotName, $mode = false) {
 		$_SESSION['destCID'] = $content['id'];
 		$_SESSION['destCType'] = $content['type'];
 		$_SESSION['destURL'] = ze\link::protocol(). ze\link::host(). $_SERVER['REQUEST_URI'];
-		$_SESSION['destTitle'] = $version['title'];
+		
+		if (!empty($version)
+		 && !empty($version['title'])) {
+			$_SESSION['destTitle'] = $version['title'];
+		}
 	}
 	ze::$canCache = false;
 	
diff --git a/zenario/js/ace.wrapper.js.php b/zenario/js/ace.wrapper.js.php
index 8f5ae36b4..974c8d9fc 100644
--- a/zenario/js/ace.wrapper.js.php
+++ b/zenario/js/ace.wrapper.js.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/admin.js b/zenario/js/admin.js
index 86c7b53c2..d52b54504 100644
--- a/zenario/js/admin.js
+++ b/zenario/js/admin.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/admin.microtemplates_and_phrases.js.php b/zenario/js/admin.microtemplates_and_phrases.js.php
index 9485aa8b6..a085c2cc1 100644
--- a/zenario/js/admin.microtemplates_and_phrases.js.php
+++ b/zenario/js/admin.microtemplates_and_phrases.js.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/admin.wrapper.js.php b/zenario/js/admin.wrapper.js.php
index b62508999..e64bf8997 100644
--- a/zenario/js/admin.wrapper.js.php
+++ b/zenario/js/admin.wrapper.js.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/admin_box.js b/zenario/js/admin_box.js
index 82d6262bc..85989ede5 100644
--- a/zenario/js/admin_box.js
+++ b/zenario/js/admin_box.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/admin_box_toolkit.js b/zenario/js/admin_box_toolkit.js
index 990b9bbfd..a9527dac6 100644
--- a/zenario/js/admin_box_toolkit.js
+++ b/zenario/js/admin_box_toolkit.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/admin_form.js b/zenario/js/admin_form.js
index 6e840df24..007652422 100644
--- a/zenario/js/admin_form.js
+++ b/zenario/js/admin_form.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/admin_grid_maker.js b/zenario/js/admin_grid_maker.js
index 4a645b745..c96bd58e8 100644
--- a/zenario/js/admin_grid_maker.js
+++ b/zenario/js/admin_grid_maker.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -483,6 +483,28 @@ zenarioGM.drawAddToolbar = function() {
 			helper: "clone",
 			revert: "invalid"
 		});
+	
+	var $addToolbar = $( "#"+ zenarioGM.addToolbarId ),
+		position = $addToolbar.position();
+	
+	//Fix a bug that caused the yellow box to stay attached to the right of the screen,
+	//and keep stretching if someone tries to pull it away.
+	//This is caused by the "right: 30px;" rule, however this rule does need to be there
+	//to get the positioning of the box correct.
+	//If the position is well defined, get whatever the current value is based off of the
+	//CSS calculation, and then manually set it to its own current value.
+	//Then it's safe to remove the "right: 30px;" rule to fix the bug, without affecting
+	//the positioning.
+	if (position
+	 && defined(position.top)
+	 && defined(position.left)) {
+		$addToolbar.css({
+			right: 'auto',
+			top: position.top,
+			left: position.left
+		});
+	}
+	
 	 $( "#"+ zenarioGM.addToolbarId ).draggable({ cursor: "move"});
 };
 
diff --git a/zenario/js/admin_grid_maker.min.js b/zenario/js/admin_grid_maker.min.js
index 04e0ffabb..ea2e2b2eb 100644
--- a/zenario/js/admin_grid_maker.min.js
+++ b/zenario/js/admin_grid_maker.min.js
@@ -1,4 +1,4 @@
-zenario.lib(function(z,u,v,s,A,g,h,n,B,C,D,E,w,x,F,l,q,G,r,H,y,t,a){a.initVars();a.gridId="grid";a.mtPrefix="zenario_grid_maker_";a.addToolbarId="grid_add_toolbar";a.init=function(c,b,e,d){a.data="object"==typeof c?c:JSON.parse(c);e&&(a.layoutName=e);b&&(a.layoutId=b);a.checkData(e,d);a.checkDataR(a.data.cells);a.rememberNames(a.data.cells);a.editing=!0;a.data.cells.length||(a.editing=!0);g&&!g.zenarioGM&&g.$&&g.$.colorbox?$("#close_button").click(function(){if(a.savedAtPos==a.pos||confirm(r.gridConfirmClose))h.stopPoking(a),
+zenario.lib(function(z,v,w,t,A,g,h,n,B,C,D,E,x,q,F,l,r,G,s,H,y,u,a){a.initVars();a.gridId="grid";a.mtPrefix="zenario_grid_maker_";a.addToolbarId="grid_add_toolbar";a.init=function(c,b,e,d){a.data="object"==typeof c?c:JSON.parse(c);e&&(a.layoutName=e);b&&(a.layoutId=b);a.checkData(e,d);a.checkDataR(a.data.cells);a.rememberNames(a.data.cells);a.editing=!0;a.data.cells.length||(a.editing=!0);g&&!g.zenarioGM&&g.$&&g.$.colorbox?$("#close_button").click(function(){if(a.savedAtPos==a.pos||confirm(s.gridConfirmClose))h.stopPoking(a),
 g.zenario&&g.zenario.cID?g.location.reload(!0):g.$.colorbox.close()}):l("close_button").style.display="none";h.startPoking(a)};a.draw=function(c){c||a.drawOptions();a.editing?a.drawEditor():a.drawPreview()};a.drawOptions=function(){var c=a.microTemplate(a.mtPrefix+"top",{formId:"settings"});$(".ui-tooltip").remove();l("settings").innerHTML=c;n._to("#settings");a.data.fluid||a.recalcColumnAndGutterOptions(a.data);$("#settings input.zenario_grid_setting_break_1").change(a.update).spinner({stop:a.update,
 min:10,step:10}).after('<span class="zenario_grid_unit">px</span>');$("#settings input.zenario_grid_setting_break_2").change(a.update).spinner({stop:a.update,min:300,step:10}).after('<span class="zenario_grid_unit">px</span>');$("#settings input.zenario_grid_setting_min_width").change(a.recalcOnChange).spinner({stop:a.recalcOnInc,min:100,step:10}).after('<span class="zenario_grid_unit">px</span>');$("#settings input.zenario_grid_setting_max_width").change(a.recalcOnChange).spinner({stop:a.recalcOnInc,
 min:320,step:10}).after('<span class="zenario_grid_unit">px</span>');$("#settings input.zenario_grid_setting_gutter_flu").change(a.recalcOnChange).spinner({stop:a.recalcOnInc,min:0,step:0.1}).after('<span class="zenario_grid_unit">%</span>');$("#settings input.zenario_grid_setting_gutter_left_flu").change(a.recalcOnChange).spinner({stop:a.recalcOnInc,min:0,step:0.1}).after('<span class="zenario_grid_unit">%</span>');$("#settings input.zenario_grid_setting_gutter_right_flu").change(a.recalcOnChange).spinner({stop:a.recalcOnInc,
@@ -7,23 +7,23 @@ min:0,step:1}).after('<span class="zenario_grid_unit">px</span>');$("#settings i
 $("#settings input.zenario_grid_setting_mirror").change(a.updateAndChange);a.canUndo()&&$("#settings .zenario_grid_setting_undo").click(function(){a.undo()});a.canRedo()&&$("#settings .zenario_grid_setting_redo").click(function(){a.redo()});$("#settings .zenario_grid_setting_preview_grid").click(function(){a.editing=!1;a.drawPreview()});$("#settings .zenario_grid_setting_edit_slots").click(function(){a.editing=!0;a.drawEditor()})};a.recalcColumnAndGutterOptions=function(a,b,e){var d=!1,p=(e?e:1*$("#settings--setting_full_width").val())-
 a.gutterLeftEdge-a.gutterRightEdge;e=Math.floor(p/a.cols);var f=0,h=!1,k=0;b||(d=l("settings--setting_col_width"));if(!a.cols)return!1;if(d)for(k=d.length-1;0<=k;--k)d.remove(k);if(1==a.cols)d&&d.add(new Option(e+" px / "+f+" px",e+"/"+f),++k),h={colWidth:e,gutter:f};else{f=a.cols-1;b=p/f;for(var p=a.cols/f,g,m=999999,k=-1;0<e;--e)f=b-p*e,f=Math.round(1E4*f)/1E4,f==Math.floor(f)&&(d&&d.add(new Option(e+" px / "+f+" px",e+"/"+f),++k),g=Math.abs(a.gutter/a.colWidth-f/e),m>g&&(d&&(d.selectedIndex=k),
 m=g,h={colWidth:e,gutter:f}))}return h};a.editProperties=function(c){var b=$(c),e=["zenario_grid_box","zenario_grid_rename_slot_box"],b={type:b.data("type"),name:b.data("name"),small:b.data("small"),height:b.data("height"),is_full:b.data("is_full"),is_last:b.data("is_last"),css_class:b.data("css_class"),html:b.data("html"),grid_css_class:b.data("grid_css_class")};$.colorbox({transition:"none",html:a.microTemplate(a.mtPrefix+"object_properties",b),onOpen:function(){h._aCTC(e)},onClosed:function(){h._rCTC(e)},
-onComplete:function(){$("#zenario_grid_slotname_button").click(function(){var b,e={},f=$("#colorbox .zenario_grid_properties_form").serializeArray();for(b in f)t(f,b)&&(e[f[b].name]=f[b].value);a.saveProperties(c,e)});$(".zenario_grid_properties_form input,textarea")[1].focus()}})};a.ajaxURL=function(){return u+"zenario/admin/grid_maker/ajax.php"};a.ajaxSrc=function(){var c=a.ajaxData(),b=a.ajaxURL()+"?data="+w(c);400<b.length&&(b=a.ajaxURL()+"?cdata="+h._nAA(a.ajaxURL(),{compress:1,data:c}));return b};
-a.drawPreview=function(){a.clearAddToolbar();a.checkData();var c=Math.max(a.desktopSmallestSize,100*Math.round(($(s).width()-a.previewPaddingLeftRight)/100)),b=Math.min(c-20,a.data.maxWidth),e=a.microTemplate(a.mtPrefix+"preview",{gridId:a.gridId,topHack:5,leftHack:10,min:100,max:c,startingValue:b});$("#"+a.gridId).css("margin","auto");$(".ui-tooltip").remove();l(a.gridId).innerHTML=e;n._to("#"+a.gridId);$('<form action="'+q(a.ajaxURL())+'" method="post" target="'+a.gridId+'-iframe"><input name="data" value="'+
-q(a.ajaxData())+'"/></form>').appendTo("body").hide().submit().remove();$("#"+a.gridId+"-slider").slider({min:100,max:c,step:10,animate:!0,value:b,start:function(b,c){$("#"+a.gridId+"-slider_overlay").css("display","block")},stop:function(b,c){$("#"+a.gridId+"-slider_overlay").css("display","none")},slide:function(b,c){$("#"+a.gridId+"-slider_val").val(c.value);$("#"+a.gridId+"-iframe").clearQueue();$("#"+a.gridId+"-size").clearQueue();!b.originalEvent||"mousedown"!=b.originalEvent.type&&"touchstart"!=
+onComplete:function(){$("#zenario_grid_slotname_button").click(function(){var b,e={},f=$("#colorbox .zenario_grid_properties_form").serializeArray();for(b in f)u(f,b)&&(e[f[b].name]=f[b].value);a.saveProperties(c,e)});$(".zenario_grid_properties_form input,textarea")[1].focus()}})};a.ajaxURL=function(){return v+"zenario/admin/grid_maker/ajax.php"};a.ajaxSrc=function(){var c=a.ajaxData(),b=a.ajaxURL()+"?data="+x(c);400<b.length&&(b=a.ajaxURL()+"?cdata="+h._nAA(a.ajaxURL(),{compress:1,data:c}));return b};
+a.drawPreview=function(){a.clearAddToolbar();a.checkData();var c=Math.max(a.desktopSmallestSize,100*Math.round(($(t).width()-a.previewPaddingLeftRight)/100)),b=Math.min(c-20,a.data.maxWidth),e=a.microTemplate(a.mtPrefix+"preview",{gridId:a.gridId,topHack:5,leftHack:10,min:100,max:c,startingValue:b});$("#"+a.gridId).css("margin","auto");$(".ui-tooltip").remove();l(a.gridId).innerHTML=e;n._to("#"+a.gridId);$('<form action="'+r(a.ajaxURL())+'" method="post" target="'+a.gridId+'-iframe"><input name="data" value="'+
+r(a.ajaxData())+'"/></form>').appendTo("body").hide().submit().remove();$("#"+a.gridId+"-slider").slider({min:100,max:c,step:10,animate:!0,value:b,start:function(b,c){$("#"+a.gridId+"-slider_overlay").css("display","block")},stop:function(b,c){$("#"+a.gridId+"-slider_overlay").css("display","none")},slide:function(b,c){$("#"+a.gridId+"-slider_val").val(c.value);$("#"+a.gridId+"-iframe").clearQueue();$("#"+a.gridId+"-size").clearQueue();!b.originalEvent||"mousedown"!=b.originalEvent.type&&"touchstart"!=
 b.originalEvent.type?($("#"+a.gridId+"-iframe").width(c.value),$("#"+a.gridId+"-size").css("marginLeft",c.value+"px")):($("#"+a.gridId+"-iframe").animate({width:c.value}),$("#"+a.gridId+"-size").animate({marginLeft:c.value}));a.resizePreview()}});$("#"+a.gridId+"-slider_val").change(function(){var b=1*this.value;b&&100<=b&&b<=c&&($("#"+a.gridId+"-slider").slider("value",b),$("#"+a.gridId+"-iframe").clearQueue().animate({width:b}),$("#"+a.gridId+"-size").clearQueue().animate({marginLeft:b}))});a.resizePreview();
-var d=function(b){$("#"+a.gridId+"-slider_val").val(b);$("#"+a.gridId+"-slider").slider("value",b);$("#"+a.gridId+"-size").clearQueue().animate({marginLeft:b});$("#"+a.gridId+"-iframe").clearQueue().animate({width:b},{complete:a.resizePreview});a.lastToast&&a.lastToast.remove();a.lastToast=toastr.info(r.gridDisplayingAt.r("[[pixels]]",b))};$("#"+a.gridId+"-slider_mobile").click(function(){d(a.mobileWidth)});$("#"+a.gridId+"-slider_tablet").click(function(){d(a.tabletWidth)});$("#"+a.gridId+"-slider_desktop").click(function(){d(c)});
+var d=function(b){$("#"+a.gridId+"-slider_val").val(b);$("#"+a.gridId+"-slider").slider("value",b);$("#"+a.gridId+"-size").clearQueue().animate({marginLeft:b});$("#"+a.gridId+"-iframe").clearQueue().animate({width:b},{complete:a.resizePreview});a.lastToast&&a.lastToast.remove();a.lastToast=toastr.info(s.gridDisplayingAt.r("[[pixels]]",b))};$("#"+a.gridId+"-slider_mobile").click(function(){d(a.mobileWidth)});$("#"+a.gridId+"-slider_tablet").click(function(){d(a.tabletWidth)});$("#"+a.gridId+"-slider_desktop").click(function(){d(c)});
 $("#settings--tabs").removeClass("zenario_grid_tabs_slots_selected").addClass("zenario_grid_tabs_grid_selected");a.drawLinks()};a.drawEditor=function(a,b,e,d,h,f,g,k,l,m,n){e||$("#settings--tabs").removeClass("zenario_grid_tabs_grid_selected").addClass("zenario_grid_tabs_slots_selected");return y(zenarioG).drawEditor.call(this,a,b,e,d,h,f,g,k,l,m,n)};a.clearAddToolbar=function(){$("#"+a.addToolbarId).hide().html("")};a.drawAddToolbar=function(){$("#"+a.addToolbarId).show().html(a.microTemplate(a.mtPrefix+
-"add_toolbar",{}));$("#"+a.addToolbarId+" a").draggable({connectToSortable:".zenario_grids",helper:"clone",revert:"invalid"});$("#"+a.addToolbarId).draggable({cursor:"move"})};$(v).ready(function(){$("#"+a.addToolbarId).hover(function(){$(this).css("cursor","move")},function(){$(this).css("cursor","pointer")})});a.resizePreview=function(){var c,b=0;(c=l(a.gridId+"-iframe"))&&c.contentWindow&&c.contentWindow.document&&c.contentWindow.document.body&&(b=$(c.contentWindow.document.body).height()||360,
-360>b&&(b=360),$("#"+a.gridId+"-iframe").height(b),$("#"+a.gridId+"-slider_overlay").height(b),$("#"+a.gridId+"-slider a").css("position","absolute").css("z-index",20).css("top","-"+(b+5)+"px").height(b+5).html('<span style="margin-top: '+Math.ceil((b+5)/2)+'px;"></span>'));a.lastIframeHeight=b};a.drawLinks=function(){a.checkData();var c={src:a.ajaxSrc()};a.microTemplate(a.mtPrefix+"bottom_links",c);$(".ui-tooltip").remove();n._to("#download_links");c=$("#"+a.gridId);a.editing?c.addClass("zenario_grid_slot_view").removeClass("zenario_grid_grid_view"):
-(c.addClass("zenario_grid_grid_view").removeClass("zenario_grid_slot_view"),c.css({height:"auto"}),c=$("#"+a.gridId+" .zenario_grid_preview_frame"));c.height(0);c.height(Math.max(a.gridAreaSmallestHeight,$(s).height()-$("body").height()-a.bodyPadding));var b=["zenario_grid_box","zenario_grid_copy_box","zenario_grid_copy_css_box"];$("#download_links a.zenario_grid_copy_css").colorbox({onOpen:function(){h._aCTC(b)},onClosed:function(){h._rCTC(b)},onComplete:function(){$("#colorbox textarea").focus()}});
-var e=["zenario_grid_box","zenario_grid_copy_box","zenario_grid_copy_html_box"];$("#download_links a.zenario_grid_copy_html").colorbox({onOpen:function(){h._aCTC(e)},onClosed:function(){h._rCTC(e)},onComplete:function(){$("#colorbox textarea").focus()}})};a.save=function(c){a.layoutId||(c=!0);var b;if(c){var e=["zenario_grid_box","zenario_grid_new_layout_box"];(b=h._nAA(a.ajaxURL(),{saveas:1,data:a.ajaxData(),layoutId:a.layoutId},!0))&&$.colorbox({transition:"none",html:a.microTemplate(a.mtPrefix+
-"save_prompt",{name:a.newLayoutName||b.oldLayoutName||""}),onOpen:function(){h._aCTC(e)},onClosed:function(){h._rCTC(e)},onComplete:function(){$("#zenario_grid_new_layout_save").click(function(){$("#zenario_grid_error").hide();(b=h._nAA(a.ajaxURL(),{saveas:1,confirm:1,data:a.ajaxData(),layoutId:a.layoutId,layoutName:a.newLayoutName=l("zenario_grid_layout_name").value},!0))?b.error?$("#zenario_grid_error").html(q(b.error)).slideDown():($.colorbox.close(),a.layoutName=a.newLayoutName,a.markAsSaved(b)):
-$.colorbox.close()});l("zenario_grid_layout_name").focus()}})}else if(b=h._nAA(a.ajaxURL(),{save:1,data:a.ajaxData(),layoutId:a.layoutId},!0))b.success?a.markAsSaved(b,!0):(n._flBo(b.message,r.gridSave,"warning",!0,!0),$("#zenario_fbMessageButtons .submit_selected").click(function(){setTimeout(function(){var b;(b=h._nAA(a.ajaxURL(),{save:1,data:a.ajaxData(),layoutId:a.layoutId,confirm:1},!0))&&a.markAsSaved(b)},50)}))};a.markAsSaved=function(c,b){a.savedAtPos=a.pos;x(c.layoutId)&&(a.layoutId=c.layoutId);
-a.rememberNames(a.data.cells);c.success&&(b?n._flBo(c.success,!0,"success"):toastr.success(c.success));if(g&&g.zenarioO.init)switch(g.zenarioO.path){case "zenario__layouts/panels/layouts":c.layoutId&&g.zenarioO._rTSI(c.layoutId)}};a.readSettings=function(a){a.fluid=$("#settings input.zenario_grid_setting_flu").prop("checked");a.responsive=$("#settings input.zenario_grid_setting_responsive").prop("checked");a.mirror=$("#settings input.zenario_grid_setting_mirror").prop("checked");a.cols=1*$("#settings input.zenario_grid_setting_cols").val();
-var b;(b=$("#settings input.zenario_grid_setting_full_width")).length?a.maxWidth=1*b.val():(b=$("#settings input.zenario_grid_setting_max_width")).length&&(a.maxWidth=1*b.val());(b=$("#settings input.zenario_grid_setting_min_width")).length&&(a.minWidth=1*b.val());(b=$("#settings input.zenario_grid_setting_break_1")).length&&(a.bp1=1*b.val());(b=$("#settings input.zenario_grid_setting_break_2")).length&&(a.bp2=1*b.val());(b=$("#settings input.zenario_grid_setting_gutter_left")).length&&(a.gutterLeftEdge=
-1*b.val());(b=$("#settings input.zenario_grid_setting_gutter_right")).length&&(a.gutterRightEdge=1*b.val());(b=$("#settings select.zenario_grid_setting_col_and_gutter")).length&&(b=b.val())&&(b=b.s("/"))&&(a.colWidth=1*b[0],a.gutter=1*b[1]);(b=$("#settings input.zenario_grid_setting_gutter_left_flu")).length&&(a.gutterLeftEdgeFlu=1*b.val());(b=$("#settings input.zenario_grid_setting_gutter_flu")).length&&(a.gutterFlu=1*b.val());(b=$("#settings input.zenario_grid_setting_gutter_right_flu")).length&&
+"add_toolbar",{}));$("#"+a.addToolbarId+" a").draggable({connectToSortable:".zenario_grids",helper:"clone",revert:"invalid"});var c=$("#"+a.addToolbarId),b=c.position();b&&q(b.top)&&q(b.left)&&c.css({right:"auto",top:b.top,left:b.left});$("#"+a.addToolbarId).draggable({cursor:"move"})};$(w).ready(function(){$("#"+a.addToolbarId).hover(function(){$(this).css("cursor","move")},function(){$(this).css("cursor","pointer")})});a.resizePreview=function(){var c,b=0;(c=l(a.gridId+"-iframe"))&&c.contentWindow&&
+c.contentWindow.document&&c.contentWindow.document.body&&(b=$(c.contentWindow.document.body).height()||360,360>b&&(b=360),$("#"+a.gridId+"-iframe").height(b),$("#"+a.gridId+"-slider_overlay").height(b),$("#"+a.gridId+"-slider a").css("position","absolute").css("z-index",20).css("top","-"+(b+5)+"px").height(b+5).html('<span style="margin-top: '+Math.ceil((b+5)/2)+'px;"></span>'));a.lastIframeHeight=b};a.drawLinks=function(){a.checkData();var c={src:a.ajaxSrc()};a.microTemplate(a.mtPrefix+"bottom_links",
+c);$(".ui-tooltip").remove();n._to("#download_links");c=$("#"+a.gridId);a.editing?c.addClass("zenario_grid_slot_view").removeClass("zenario_grid_grid_view"):(c.addClass("zenario_grid_grid_view").removeClass("zenario_grid_slot_view"),c.css({height:"auto"}),c=$("#"+a.gridId+" .zenario_grid_preview_frame"));c.height(0);c.height(Math.max(a.gridAreaSmallestHeight,$(t).height()-$("body").height()-a.bodyPadding));var b=["zenario_grid_box","zenario_grid_copy_box","zenario_grid_copy_css_box"];$("#download_links a.zenario_grid_copy_css").colorbox({onOpen:function(){h._aCTC(b)},
+onClosed:function(){h._rCTC(b)},onComplete:function(){$("#colorbox textarea").focus()}});var e=["zenario_grid_box","zenario_grid_copy_box","zenario_grid_copy_html_box"];$("#download_links a.zenario_grid_copy_html").colorbox({onOpen:function(){h._aCTC(e)},onClosed:function(){h._rCTC(e)},onComplete:function(){$("#colorbox textarea").focus()}})};a.save=function(c){a.layoutId||(c=!0);var b;if(c){var e=["zenario_grid_box","zenario_grid_new_layout_box"];(b=h._nAA(a.ajaxURL(),{saveas:1,data:a.ajaxData(),
+layoutId:a.layoutId},!0))&&$.colorbox({transition:"none",html:a.microTemplate(a.mtPrefix+"save_prompt",{name:a.newLayoutName||b.oldLayoutName||""}),onOpen:function(){h._aCTC(e)},onClosed:function(){h._rCTC(e)},onComplete:function(){$("#zenario_grid_new_layout_save").click(function(){$("#zenario_grid_error").hide();(b=h._nAA(a.ajaxURL(),{saveas:1,confirm:1,data:a.ajaxData(),layoutId:a.layoutId,layoutName:a.newLayoutName=l("zenario_grid_layout_name").value},!0))?b.error?$("#zenario_grid_error").html(r(b.error)).slideDown():
+($.colorbox.close(),a.layoutName=a.newLayoutName,a.markAsSaved(b)):$.colorbox.close()});l("zenario_grid_layout_name").focus()}})}else if(b=h._nAA(a.ajaxURL(),{save:1,data:a.ajaxData(),layoutId:a.layoutId},!0))b.success?a.markAsSaved(b,!0):(n._flBo(b.message,s.gridSave,"warning",!0,!0),$("#zenario_fbMessageButtons .submit_selected").click(function(){setTimeout(function(){var b;(b=h._nAA(a.ajaxURL(),{save:1,data:a.ajaxData(),layoutId:a.layoutId,confirm:1},!0))&&a.markAsSaved(b)},50)}))};a.markAsSaved=
+function(c,b){a.savedAtPos=a.pos;q(c.layoutId)&&(a.layoutId=c.layoutId);a.rememberNames(a.data.cells);c.success&&(b?n._flBo(c.success,!0,"success"):toastr.success(c.success));if(g&&g.zenarioO.init)switch(g.zenarioO.path){case "zenario__layouts/panels/layouts":c.layoutId&&g.zenarioO._rTSI(c.layoutId)}};a.readSettings=function(a){a.fluid=$("#settings input.zenario_grid_setting_flu").prop("checked");a.responsive=$("#settings input.zenario_grid_setting_responsive").prop("checked");a.mirror=$("#settings input.zenario_grid_setting_mirror").prop("checked");
+a.cols=1*$("#settings input.zenario_grid_setting_cols").val();var b;(b=$("#settings input.zenario_grid_setting_full_width")).length?a.maxWidth=1*b.val():(b=$("#settings input.zenario_grid_setting_max_width")).length&&(a.maxWidth=1*b.val());(b=$("#settings input.zenario_grid_setting_min_width")).length&&(a.minWidth=1*b.val());(b=$("#settings input.zenario_grid_setting_break_1")).length&&(a.bp1=1*b.val());(b=$("#settings input.zenario_grid_setting_break_2")).length&&(a.bp2=1*b.val());(b=$("#settings input.zenario_grid_setting_gutter_left")).length&&
+(a.gutterLeftEdge=1*b.val());(b=$("#settings input.zenario_grid_setting_gutter_right")).length&&(a.gutterRightEdge=1*b.val());(b=$("#settings select.zenario_grid_setting_col_and_gutter")).length&&(b=b.val())&&(b=b.s("/"))&&(a.colWidth=1*b[0],a.gutter=1*b[1]);(b=$("#settings input.zenario_grid_setting_gutter_left_flu")).length&&(a.gutterLeftEdgeFlu=1*b.val());(b=$("#settings input.zenario_grid_setting_gutter_flu")).length&&(a.gutterFlu=1*b.val());(b=$("#settings input.zenario_grid_setting_gutter_right_flu")).length&&
 (a.gutterRightEdgeFlu=1*b.val())};a.updateAndChange=function(){a.update();a.change()};a.update=function(){a.readSettings(a.data);a.checkData()};a.recalcOnKeyUp=function(){a.recalc(this)};a.recalcOnChange=function(){a.recalc(this,!0,!0)};a.recalcOnInc=function(c,b){if(c.originalEvent&&"mouseup"==c.originalEvent.type)return a.recalc(this,!0)};a.recalc=function(c,b,e){var d=$.extend(!1,{},a.data),h=!1,f=!1,g=0,k=c.className,l;d.fluid?(delete d.gutter,delete d.gutterLeftEdge,delete d.gutterRightEdge):
 (delete d.gutterFlu,delete d.gutterLeftEdgeFlu,delete d.gutterRightEdgeFlu);e||(h=JSON.stringify(d));a.readSettings(d);f=a.checkDataNonZeroAndNumeric(d,f);if(d.fluid)delete d.gutter,delete d.gutterLeftEdge,delete d.gutterRightEdge;else{switch(k.s(" ")[0]){case "zenario_grid_setting_full_width":g=1;break;case "zenario_grid_setting_cols":g=2;break;case "zenario_grid_setting_gutter_left":g=3;break;case "zenario_grid_setting_gutter_right":g=4;break;case "zenario_grid_setting_col_and_gutter":g=5}if(g){if(e||
 $(c).val()!=$(c).attr("data-initial-value"))$(c).attr("data-initial-value",$(c).val());else return;do if(!d.maxWidth||1>d.cols)f=!0;else{if(d.gutterLeftEdge+d.cols+d.gutterRightEdge>d.maxWidth)if(3>g)d.gutterLeftEdge=d.gutterRightEdge=0;else{f=!0;break}5>g&&(l=a.recalcColumnAndGutterOptions(d))&&(d.colWidth=l.colWidth,d.gutter=l.gutter);var f=a.checkDataNonZeroAndNumeric(d,f),k=0,m=[{l:3,c:"zenario_grid_setting_gutter_left",v:d.gutterLeftEdge},{l:4,c:"zenario_grid_setting_gutter_right",v:d.gutterRightEdge},
-{l:5,c:"zenario_grid_setting_col_and_gutter",v:d.colWidth+"/"+d.gutter}];for(k in m)if(t(m,k)&&g<m[k].l){var n=$("#settings ."+m[k].c);n.val()!=m[k].v&&n.animate({opacity:0.3},"fast").val(m[k].v).animate({opacity:1},"fast")}}while(0)}delete d.gutterFlu;delete d.gutterLeftEdgeFlu;delete d.gutterRightEdgeFlu}if(e||h!=JSON.stringify(d))$("#settings .zenario_grid_setting_warning").removeClass("zenario_grid_setting_warning"),b?f?a.revert():(a.readSettings(a.data),a.checkDataNonZeroAndNumeric(a.data),a.change(!1,
+{l:5,c:"zenario_grid_setting_col_and_gutter",v:d.colWidth+"/"+d.gutter}];for(k in m)if(u(m,k)&&g<m[k].l){var n=$("#settings ."+m[k].c);n.val()!=m[k].v&&n.animate({opacity:0.3},"fast").val(m[k].v).animate({opacity:1},"fast")}}while(0)}delete d.gutterFlu;delete d.gutterLeftEdgeFlu;delete d.gutterRightEdgeFlu}if(e||h!=JSON.stringify(d))$("#settings .zenario_grid_setting_warning").removeClass("zenario_grid_setting_warning"),b?f?a.revert():(a.readSettings(a.data),a.checkDataNonZeroAndNumeric(a.data),a.change(!1,
 !0)):f&&$(c).parent().addClass("zenario_grid_setting_warning");return!f}},window.zenarioGM=new zenarioG);
diff --git a/zenario/js/admin_layout_preview.js b/zenario/js/admin_layout_preview.js
index aa7e1f214..5c2493a2a 100644
--- a/zenario/js/admin_layout_preview.js
+++ b/zenario/js/admin_layout_preview.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/admin_organizer.js b/zenario/js/admin_organizer.js
index 75d921d7f..ff3fbccdd 100644
--- a/zenario/js/admin_organizer.js
+++ b/zenario/js/admin_organizer.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/admin_skin_editor.js b/zenario/js/admin_skin_editor.js
index 1bc965543..6a2717a5c 100644
--- a/zenario/js/admin_skin_editor.js
+++ b/zenario/js/admin_skin_editor.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/admin_toolbar.js b/zenario/js/admin_toolbar.js
index 98db29940..cc32542ab 100644
--- a/zenario/js/admin_toolbar.js
+++ b/zenario/js/admin_toolbar.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/admin_welcome.js b/zenario/js/admin_welcome.js
index ff964cc3d..bf3749f12 100644
--- a/zenario/js/admin_welcome.js
+++ b/zenario/js/admin_welcome.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/base_definitions.js b/zenario/js/base_definitions.js
index 9ea3ee63f..91c795422 100644
--- a/zenario/js/base_definitions.js
+++ b/zenario/js/base_definitions.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/body.js b/zenario/js/body.js
index 6390d5bd0..d344d9480 100644
--- a/zenario/js/body.js
+++ b/zenario/js/body.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/dev_tools.js b/zenario/js/dev_tools.js
index d9046bd68..629e34ee9 100644
--- a/zenario/js/dev_tools.js
+++ b/zenario/js/dev_tools.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/form.js b/zenario/js/form.js
index 40b2b4e21..0a2f1afc9 100644
--- a/zenario/js/form.js
+++ b/zenario/js/form.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/grid.js b/zenario/js/grid.js
index 509b5c09e..6f46289bb 100644
--- a/zenario/js/grid.js
+++ b/zenario/js/grid.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/highcharts.wrapper.js.php b/zenario/js/highcharts.wrapper.js.php
index 525a1b7e6..cb66a5fee 100644
--- a/zenario/js/highcharts.wrapper.js.php
+++ b/zenario/js/highcharts.wrapper.js.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/ie.wrapper.js.php b/zenario/js/ie.wrapper.js.php
index 29d817738..326f8fd7f 100644
--- a/zenario/js/ie.wrapper.js.php
+++ b/zenario/js/ie.wrapper.js.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/js_minify.shell.php b/zenario/js/js_minify.shell.php
index f720da183..3c62e14c7 100644
--- a/zenario/js/js_minify.shell.php
+++ b/zenario/js/js_minify.shell.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/organizer.wrapper.js.php b/zenario/js/organizer.wrapper.js.php
index 57598e20c..bd26e5bc9 100644
--- a/zenario/js/organizer.wrapper.js.php
+++ b/zenario/js/organizer.wrapper.js.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/panel_type_admin_box_builder.js b/zenario/js/panel_type_admin_box_builder.js
index c0663ba68..ea0b53934 100644
--- a/zenario/js/panel_type_admin_box_builder.js
+++ b/zenario/js/panel_type_admin_box_builder.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/panel_type_form_builder.js b/zenario/js/panel_type_form_builder.js
index 36452d98b..00bb28974 100644
--- a/zenario/js/panel_type_form_builder.js
+++ b/zenario/js/panel_type_form_builder.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/panel_type_form_builder_base_class.js b/zenario/js/panel_type_form_builder_base_class.js
index b7b48e178..bd22b515f 100644
--- a/zenario/js/panel_type_form_builder_base_class.js
+++ b/zenario/js/panel_type_form_builder_base_class.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/panel_type_google_map.js b/zenario/js/panel_type_google_map.js
index bae8f09e9..f685a0bba 100644
--- a/zenario/js/panel_type_google_map.js
+++ b/zenario/js/panel_type_google_map.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/panel_type_google_map_or_list.js b/zenario/js/panel_type_google_map_or_list.js
index 7881b63f7..da95695be 100644
--- a/zenario/js/panel_type_google_map_or_list.js
+++ b/zenario/js/panel_type_google_map_or_list.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/panel_type_grid.js b/zenario/js/panel_type_grid.js
index 8e7e54ac6..64d304939 100644
--- a/zenario/js/panel_type_grid.js
+++ b/zenario/js/panel_type_grid.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/panel_type_hierarchy.js b/zenario/js/panel_type_hierarchy.js
index 7990485a0..a63578fd0 100644
--- a/zenario/js/panel_type_hierarchy.js
+++ b/zenario/js/panel_type_hierarchy.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/panel_type_hierarchy_documents.js b/zenario/js/panel_type_hierarchy_documents.js
index 6a1bf857f..35678b7c3 100644
--- a/zenario/js/panel_type_hierarchy_documents.js
+++ b/zenario/js/panel_type_hierarchy_documents.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/panel_type_hierarchy_with_lazy_load.js b/zenario/js/panel_type_hierarchy_with_lazy_load.js
index 5056c4362..b15efbf5d 100644
--- a/zenario/js/panel_type_hierarchy_with_lazy_load.js
+++ b/zenario/js/panel_type_hierarchy_with_lazy_load.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/panel_type_list.js b/zenario/js/panel_type_list.js
index 0370f53c1..b1c723fe5 100644
--- a/zenario/js/panel_type_list.js
+++ b/zenario/js/panel_type_list.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/panel_type_list_or_grid.js b/zenario/js/panel_type_list_or_grid.js
index ed2c90231..8242907cc 100644
--- a/zenario/js/panel_type_list_or_grid.js
+++ b/zenario/js/panel_type_list_or_grid.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/panel_type_list_with_caching_disabled.js b/zenario/js/panel_type_list_with_caching_disabled.js
index 01c985132..b02ff3265 100644
--- a/zenario/js/panel_type_list_with_caching_disabled.js
+++ b/zenario/js/panel_type_list_with_caching_disabled.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/panel_type_list_with_master_switch.js b/zenario/js/panel_type_list_with_master_switch.js
index a30a74bcd..f102bdbef 100644
--- a/zenario/js/panel_type_list_with_master_switch.js
+++ b/zenario/js/panel_type_list_with_master_switch.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/panel_type_list_with_subheadings.js b/zenario/js/panel_type_list_with_subheadings.js
index b2f979335..646fbb1c4 100644
--- a/zenario/js/panel_type_list_with_subheadings.js
+++ b/zenario/js/panel_type_list_with_subheadings.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/panel_type_list_with_totals.js b/zenario/js/panel_type_list_with_totals.js
index ffa71354b..042876795 100644
--- a/zenario/js/panel_type_list_with_totals.js
+++ b/zenario/js/panel_type_list_with_totals.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/panel_type_list_with_totals_on_refiners.js b/zenario/js/panel_type_list_with_totals_on_refiners.js
index c929fa641..a37a32123 100644
--- a/zenario/js/panel_type_list_with_totals_on_refiners.js
+++ b/zenario/js/panel_type_list_with_totals_on_refiners.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/panel_type_multi_line_list.js b/zenario/js/panel_type_multi_line_list.js
index fb7fce967..25150d639 100644
--- a/zenario/js/panel_type_multi_line_list.js
+++ b/zenario/js/panel_type_multi_line_list.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/panel_type_multi_line_list_or_grid.js b/zenario/js/panel_type_multi_line_list_or_grid.js
index 646ace814..3ea25611b 100644
--- a/zenario/js/panel_type_multi_line_list_or_grid.js
+++ b/zenario/js/panel_type_multi_line_list_or_grid.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/panel_type_network_graph.js b/zenario/js/panel_type_network_graph.js
index 04d8ef6ee..56ea24ace 100644
--- a/zenario/js/panel_type_network_graph.js
+++ b/zenario/js/panel_type_network_graph.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/panel_type_slot_reload_on_change.js b/zenario/js/panel_type_slot_reload_on_change.js
index 5e43cbafe..125c4dd12 100644
--- a/zenario/js/panel_type_slot_reload_on_change.js
+++ b/zenario/js/panel_type_slot_reload_on_change.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/panel_type_start_page.js b/zenario/js/panel_type_start_page.js
index 702baafa2..666ebb97c 100644
--- a/zenario/js/panel_type_start_page.js
+++ b/zenario/js/panel_type_start_page.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/plugin.wrapper.js.php b/zenario/js/plugin.wrapper.js.php
index b09858ec1..8edab11b9 100644
--- a/zenario/js/plugin.wrapper.js.php
+++ b/zenario/js/plugin.wrapper.js.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/slide_designer.js b/zenario/js/slide_designer.js
index 4ab34d33b..15205f61b 100644
--- a/zenario/js/slide_designer.js
+++ b/zenario/js/slide_designer.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/slide_designer_microtemplates.js.php b/zenario/js/slide_designer_microtemplates.js.php
index b1cb82630..94c616895 100644
--- a/zenario/js/slide_designer_microtemplates.js.php
+++ b/zenario/js/slide_designer_microtemplates.js.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/tidy_libs.shell.php b/zenario/js/tidy_libs.shell.php
index 4de0a642e..3ad48a14e 100644
--- a/zenario/js/tidy_libs.shell.php
+++ b/zenario/js/tidy_libs.shell.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/tuix.js b/zenario/js/tuix.js
index a9f063fbf..b6b616fb3 100644
--- a/zenario/js/tuix.js
+++ b/zenario/js/tuix.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/tuix.ready.js b/zenario/js/tuix.ready.js
index 0d4d33e52..be9b61594 100644
--- a/zenario/js/tuix.ready.js
+++ b/zenario/js/tuix.ready.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/tuix.wrapper.js.php b/zenario/js/tuix.wrapper.js.php
index b8c7e6b34..f7b79e253 100644
--- a/zenario/js/tuix.wrapper.js.php
+++ b/zenario/js/tuix.wrapper.js.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/visitor.js b/zenario/js/visitor.js
index eded595c3..7766a1bb6 100644
--- a/zenario/js/visitor.js
+++ b/zenario/js/visitor.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/visitor.phrases.js.php b/zenario/js/visitor.phrases.js.php
index 421d3fb23..4cd7c1466 100644
--- a/zenario/js/visitor.phrases.js.php
+++ b/zenario/js/visitor.phrases.js.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/visitor.ready.js b/zenario/js/visitor.ready.js
index 10b8eb6b3..377b81b09 100644
--- a/zenario/js/visitor.ready.js
+++ b/zenario/js/visitor.ready.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/visitor.wrapper.js.php b/zenario/js/visitor.wrapper.js.php
index 53ce3c5b6..d346bdf7d 100644
--- a/zenario/js/visitor.wrapper.js.php
+++ b/zenario/js/visitor.wrapper.js.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/js/wizard.js b/zenario/js/wizard.js
index e511ae888..eda5f6ad3 100644
--- a/zenario/js/wizard.js
+++ b/zenario/js/wizard.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_abstract_fea/fun/handleNavigationInFormat.php b/zenario/modules/zenario_abstract_fea/fun/handleNavigationInFormat.php
index c767a0e39..8d359ee12 100644
--- a/zenario/modules/zenario_abstract_fea/fun/handleNavigationInFormat.php
+++ b/zenario/modules/zenario_abstract_fea/fun/handleNavigationInFormat.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_abstract_fea/fun/handleNavigationInValidate.php b/zenario/modules/zenario_abstract_fea/fun/handleNavigationInValidate.php
index 75c8db139..7ae04d363 100644
--- a/zenario/modules/zenario_abstract_fea/fun/handleNavigationInValidate.php
+++ b/zenario/modules/zenario_abstract_fea/fun/handleNavigationInValidate.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_abstract_fea/fun/loadSlotSettings.php b/zenario/modules/zenario_abstract_fea/fun/loadSlotSettings.php
index e68daee53..6a370b273 100644
--- a/zenario/modules/zenario_abstract_fea/fun/loadSlotSettings.php
+++ b/zenario/modules/zenario_abstract_fea/fun/loadSlotSettings.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_abstract_fea/fun/saveDatasetFields.php b/zenario/modules/zenario_abstract_fea/fun/saveDatasetFields.php
index e64ad4706..db9e7ceb7 100644
--- a/zenario/modules/zenario_abstract_fea/fun/saveDatasetFields.php
+++ b/zenario/modules/zenario_abstract_fea/fun/saveDatasetFields.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_abstract_fea/fun/saveSlotSettingsAndClose.php b/zenario/modules/zenario_abstract_fea/fun/saveSlotSettingsAndClose.php
index 71af33aab..b9f9573e8 100644
--- a/zenario/modules/zenario_abstract_fea/fun/saveSlotSettingsAndClose.php
+++ b/zenario/modules/zenario_abstract_fea/fun/saveSlotSettingsAndClose.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_abstract_fea/fun/setupDatasetFields.php b/zenario/modules/zenario_abstract_fea/fun/setupDatasetFields.php
index 286a83045..d068db03d 100644
--- a/zenario/modules/zenario_abstract_fea/fun/setupDatasetFields.php
+++ b/zenario/modules/zenario_abstract_fea/fun/setupDatasetFields.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_abstract_fea/fun/setupOverridesForPhrases.php b/zenario/modules/zenario_abstract_fea/fun/setupOverridesForPhrases.php
index e7571e1d3..6ac6d73ac 100644
--- a/zenario/modules/zenario_abstract_fea/fun/setupOverridesForPhrases.php
+++ b/zenario/modules/zenario_abstract_fea/fun/setupOverridesForPhrases.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_abstract_fea/fun/slideLayoutPrivacyDesc.php b/zenario/modules/zenario_abstract_fea/fun/slideLayoutPrivacyDesc.php
index cc4d0a7b1..0690e1686 100644
--- a/zenario/modules/zenario_abstract_fea/fun/slideLayoutPrivacyDesc.php
+++ b/zenario/modules/zenario_abstract_fea/fun/slideLayoutPrivacyDesc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_abstract_fea/js/form.js b/zenario/modules/zenario_abstract_fea/js/form.js
index 6a94c9cd2..77e838dd5 100644
--- a/zenario/modules/zenario_abstract_fea/js/form.js
+++ b/zenario/modules/zenario_abstract_fea/js/form.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_abstract_fea/module_code.php b/zenario/modules/zenario_abstract_fea/module_code.php
index a8a05f3f7..432ea2b86 100644
--- a/zenario/modules/zenario_abstract_fea/module_code.php
+++ b/zenario/modules/zenario_abstract_fea/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_abstract_list/module_code.php b/zenario/modules/zenario_abstract_list/module_code.php
index f7eead5ca..e5a94234f 100644
--- a/zenario/modules/zenario_abstract_list/module_code.php
+++ b/zenario/modules/zenario_abstract_list/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_abstract_manager/module_code.php b/zenario/modules/zenario_abstract_manager/module_code.php
index 66efce61d..8a5e211d4 100644
--- a/zenario/modules/zenario_abstract_manager/module_code.php
+++ b/zenario/modules/zenario_abstract_manager/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_abstract_viewer/module_code.php b/zenario/modules/zenario_abstract_viewer/module_code.php
index 04705aea5..848ad90c3 100644
--- a/zenario/modules/zenario_abstract_viewer/module_code.php
+++ b/zenario/modules/zenario_abstract_viewer/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_access_key_map/module_code.php b/zenario/modules/zenario_access_key_map/module_code.php
index caccedb5e..3386a190a 100644
--- a/zenario/modules/zenario_access_key_map/module_code.php
+++ b/zenario/modules/zenario_access_key_map/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_advanced_interface_tools_fea/classes/admin_boxes/plugin_settings.php b/zenario/modules/zenario_advanced_interface_tools_fea/classes/admin_boxes/plugin_settings.php
index e6cc2def2..e5f6c62a9 100644
--- a/zenario/modules/zenario_advanced_interface_tools_fea/classes/admin_boxes/plugin_settings.php
+++ b/zenario/modules/zenario_advanced_interface_tools_fea/classes/admin_boxes/plugin_settings.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_advanced_interface_tools_fea/classes/admin_boxes/site_settings.php b/zenario/modules/zenario_advanced_interface_tools_fea/classes/admin_boxes/site_settings.php
index e7ac84eed..8aad5620b 100644
--- a/zenario/modules/zenario_advanced_interface_tools_fea/classes/admin_boxes/site_settings.php
+++ b/zenario/modules/zenario_advanced_interface_tools_fea/classes/admin_boxes/site_settings.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_advanced_interface_tools_fea/classes/visitor/create_tuix_snippet.php b/zenario/modules/zenario_advanced_interface_tools_fea/classes/visitor/create_tuix_snippet.php
index 71688d3df..099b32401 100644
--- a/zenario/modules/zenario_advanced_interface_tools_fea/classes/visitor/create_tuix_snippet.php
+++ b/zenario/modules/zenario_advanced_interface_tools_fea/classes/visitor/create_tuix_snippet.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_advanced_interface_tools_fea/classes/visitor/edit_tuix_snippet.php b/zenario/modules/zenario_advanced_interface_tools_fea/classes/visitor/edit_tuix_snippet.php
index ff06926bc..b57516216 100644
--- a/zenario/modules/zenario_advanced_interface_tools_fea/classes/visitor/edit_tuix_snippet.php
+++ b/zenario/modules/zenario_advanced_interface_tools_fea/classes/visitor/edit_tuix_snippet.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_advanced_interface_tools_fea/classes/visitor/list_tuix_snippets.php b/zenario/modules/zenario_advanced_interface_tools_fea/classes/visitor/list_tuix_snippets.php
index 18aa49e41..36128cebb 100644
--- a/zenario/modules/zenario_advanced_interface_tools_fea/classes/visitor/list_tuix_snippets.php
+++ b/zenario/modules/zenario_advanced_interface_tools_fea/classes/visitor/list_tuix_snippets.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_advanced_interface_tools_fea/module_code.php b/zenario/modules/zenario_advanced_interface_tools_fea/module_code.php
index 043c1bbb5..e2b07c580 100644
--- a/zenario/modules/zenario_advanced_interface_tools_fea/module_code.php
+++ b/zenario/modules/zenario_advanced_interface_tools_fea/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_advanced_search/module_code.php b/zenario/modules/zenario_advanced_search/module_code.php
index b7faec649..32e919e5a 100644
--- a/zenario/modules/zenario_advanced_search/module_code.php
+++ b/zenario/modules/zenario_advanced_search/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_anonymous_comments/db_updates/comments_email_templates.inc.php b/zenario/modules/zenario_anonymous_comments/db_updates/comments_email_templates.inc.php
index c62757eb0..9a0b62fe3 100644
--- a/zenario/modules/zenario_anonymous_comments/db_updates/comments_email_templates.inc.php
+++ b/zenario/modules/zenario_anonymous_comments/db_updates/comments_email_templates.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_anonymous_comments/db_updates/comments_tables.inc.php b/zenario/modules/zenario_anonymous_comments/db_updates/comments_tables.inc.php
index 5140cd210..c1c82ed4e 100644
--- a/zenario/modules/zenario_anonymous_comments/db_updates/comments_tables.inc.php
+++ b/zenario/modules/zenario_anonymous_comments/db_updates/comments_tables.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_anonymous_comments/fun/addReply.php b/zenario/modules/zenario_anonymous_comments/fun/addReply.php
index 0020d70f6..039569ee0 100644
--- a/zenario/modules/zenario_anonymous_comments/fun/addReply.php
+++ b/zenario/modules/zenario_anonymous_comments/fun/addReply.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_anonymous_comments/fun/fillAdminBox.php b/zenario/modules/zenario_anonymous_comments/fun/fillAdminBox.php
index 826567c7b..e416cab94 100644
--- a/zenario/modules/zenario_anonymous_comments/fun/fillAdminBox.php
+++ b/zenario/modules/zenario_anonymous_comments/fun/fillAdminBox.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_anonymous_comments/fun/fillOrganizerPanel.php b/zenario/modules/zenario_anonymous_comments/fun/fillOrganizerPanel.php
index 9af745afe..676659636 100644
--- a/zenario/modules/zenario_anonymous_comments/fun/fillOrganizerPanel.php
+++ b/zenario/modules/zenario_anonymous_comments/fun/fillOrganizerPanel.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_anonymous_comments/fun/formatAdminBox.php b/zenario/modules/zenario_anonymous_comments/fun/formatAdminBox.php
index 326174291..099bbf1ec 100644
--- a/zenario/modules/zenario_anonymous_comments/fun/formatAdminBox.php
+++ b/zenario/modules/zenario_anonymous_comments/fun/formatAdminBox.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_anonymous_comments/fun/handleOrganizerPanelAJAX.php b/zenario/modules/zenario_anonymous_comments/fun/handleOrganizerPanelAJAX.php
index 91e49327c..0d86b207f 100644
--- a/zenario/modules/zenario_anonymous_comments/fun/handleOrganizerPanelAJAX.php
+++ b/zenario/modules/zenario_anonymous_comments/fun/handleOrganizerPanelAJAX.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_anonymous_comments/fun/reportPost.php b/zenario/modules/zenario_anonymous_comments/fun/reportPost.php
index ea3c2ecf7..08c1bae0d 100644
--- a/zenario/modules/zenario_anonymous_comments/fun/reportPost.php
+++ b/zenario/modules/zenario_anonymous_comments/fun/reportPost.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_anonymous_comments/fun/sendApproveRequest.php b/zenario/modules/zenario_anonymous_comments/fun/sendApproveRequest.php
index ea79e4176..79f244956 100644
--- a/zenario/modules/zenario_anonymous_comments/fun/sendApproveRequest.php
+++ b/zenario/modules/zenario_anonymous_comments/fun/sendApproveRequest.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_anonymous_comments/fun/sendEmailNotification.php b/zenario/modules/zenario_anonymous_comments/fun/sendEmailNotification.php
index 64b4e1c8e..c79cde5ec 100644
--- a/zenario/modules/zenario_anonymous_comments/fun/sendEmailNotification.php
+++ b/zenario/modules/zenario_anonymous_comments/fun/sendEmailNotification.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_anonymous_comments/fun/showPostScreen.php b/zenario/modules/zenario_anonymous_comments/fun/showPostScreen.php
index 8d0b01bd7..a39cd42a7 100644
--- a/zenario/modules/zenario_anonymous_comments/fun/showPostScreen.php
+++ b/zenario/modules/zenario_anonymous_comments/fun/showPostScreen.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_anonymous_comments/fun/threadActionHandler.php b/zenario/modules/zenario_anonymous_comments/fun/threadActionHandler.php
index 77723f72a..23bd1802f 100644
--- a/zenario/modules/zenario_anonymous_comments/fun/threadActionHandler.php
+++ b/zenario/modules/zenario_anonymous_comments/fun/threadActionHandler.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_anonymous_comments/js/plugin.js b/zenario/modules/zenario_anonymous_comments/js/plugin.js
index 735b4a2ea..057a543ef 100644
--- a/zenario/modules/zenario_anonymous_comments/js/plugin.js
+++ b/zenario/modules/zenario_anonymous_comments/js/plugin.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_anonymous_comments/module_code.php b/zenario/modules/zenario_anonymous_comments/module_code.php
index 7b8ff24b0..7012d8f83 100644
--- a/zenario/modules/zenario_anonymous_comments/module_code.php
+++ b/zenario/modules/zenario_anonymous_comments/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_banner/classes/admin_boxes/plugin_settings.php b/zenario/modules/zenario_banner/classes/admin_boxes/plugin_settings.php
index 1391ae94e..a5b9a93e0 100644
--- a/zenario/modules/zenario_banner/classes/admin_boxes/plugin_settings.php
+++ b/zenario/modules/zenario_banner/classes/admin_boxes/plugin_settings.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_banner/classes/visitor/slot_settings_zenario_banner.php b/zenario/modules/zenario_banner/classes/visitor/slot_settings_zenario_banner.php
index abb7d80a1..ef6c2e403 100644
--- a/zenario/modules/zenario_banner/classes/visitor/slot_settings_zenario_banner.php
+++ b/zenario/modules/zenario_banner/classes/visitor/slot_settings_zenario_banner.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_banner/js/admin.js b/zenario/modules/zenario_banner/js/admin.js
index f8e040d2f..b90f1c6ef 100644
--- a/zenario/modules/zenario_banner/js/admin.js
+++ b/zenario/modules/zenario_banner/js/admin.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_banner/module_code.php b/zenario/modules/zenario_banner/module_code.php
index 4f3d2a20a..357cf8775 100644
--- a/zenario/modules/zenario_banner/module_code.php
+++ b/zenario/modules/zenario_banner/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_breadcrumbs/module_code.php b/zenario/modules/zenario_breadcrumbs/module_code.php
index d7506db64..68837d003 100644
--- a/zenario/modules/zenario_breadcrumbs/module_code.php
+++ b/zenario/modules/zenario_breadcrumbs/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_comments/db_updates/comments_email_templates.inc.php b/zenario/modules/zenario_comments/db_updates/comments_email_templates.inc.php
index dec1253c3..08111b99d 100644
--- a/zenario/modules/zenario_comments/db_updates/comments_email_templates.inc.php
+++ b/zenario/modules/zenario_comments/db_updates/comments_email_templates.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_comments/db_updates/comments_tables.inc.php b/zenario/modules/zenario_comments/db_updates/comments_tables.inc.php
index 654b45006..4f8b2c1ee 100644
--- a/zenario/modules/zenario_comments/db_updates/comments_tables.inc.php
+++ b/zenario/modules/zenario_comments/db_updates/comments_tables.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_comments/fun/sendEmailNotificationToSubscribers.php b/zenario/modules/zenario_comments/fun/sendEmailNotificationToSubscribers.php
index 31c83869e..e0ea2abec 100644
--- a/zenario/modules/zenario_comments/fun/sendEmailNotificationToSubscribers.php
+++ b/zenario/modules/zenario_comments/fun/sendEmailNotificationToSubscribers.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_comments/module_code.php b/zenario/modules/zenario_comments/module_code.php
index 8a74a3635..ccaeadf62 100644
--- a/zenario/modules/zenario_comments/module_code.php
+++ b/zenario/modules/zenario_comments/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/admin.php b/zenario/modules/zenario_common_features/classes/admin_boxes/admin.php
index c06848ec6..8f49419d0 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/admin.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/admin.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/admin_copy_perms.php b/zenario/modules/zenario_common_features/classes/admin_boxes/admin_copy_perms.php
index 7854ef9c7..70a00de12 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/admin_copy_perms.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/admin_copy_perms.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/alias.php b/zenario/modules/zenario_common_features/classes/admin_boxes/alias.php
index 05b5e822a..5da4bc320 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/alias.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/alias.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/backup.php b/zenario/modules/zenario_common_features/classes/admin_boxes/backup.php
index 5ed7df43e..efa7a16fb 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/backup.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/backup.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/categories.php b/zenario/modules/zenario_common_features/classes/admin_boxes/categories.php
index 668eae731..b10233fbb 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/categories.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/categories.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/change_tags.php b/zenario/modules/zenario_common_features/classes/admin_boxes/change_tags.php
index 8d862bfae..ea2e0c30d 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/change_tags.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/change_tags.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/content.php b/zenario/modules/zenario_common_features/classes/admin_boxes/content.php
index 446f7d1c7..2c6efa864 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/content.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/content.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -726,7 +726,7 @@ public function fillAdminBox($path, $settingGroup, &$box, &$fields, &$values) {
 			}
 			//To show warning message for sheduled datetime content item in FAB
 			$checkIfPublishsql = "SELECT id,scheduled_publish_datetime from ". DB_PREFIX. "content_item_versions 
-					WHERE id IN (". $box['key']['cID']. ")
+					WHERE id IN (". (int) $box['key']['cID']. ")
 			  AND scheduled_publish_datetime IS NOT NULL
 			  AND published_datetime IS NULL AND publisher_id=0" ;
 				$checkIfPublish = ze\sql::select($checkIfPublishsql);
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/content_categories.php b/zenario/modules/zenario_common_features/classes/admin_boxes/content_categories.php
index ee52396f0..7d90f718b 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/content_categories.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/content_categories.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/content_categories_add.php b/zenario/modules/zenario_common_features/classes/admin_boxes/content_categories_add.php
index d0f3a7e1b..67071dce0 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/content_categories_add.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/content_categories_add.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/content_categories_remove.php b/zenario/modules/zenario_common_features/classes/admin_boxes/content_categories_remove.php
index 8319e4478..c5105a499 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/content_categories_remove.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/content_categories_remove.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/content_layout.php b/zenario/modules/zenario_common_features/classes/admin_boxes/content_layout.php
index 33a567423..fdd1f1139 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/content_layout.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/content_layout.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -75,24 +75,36 @@ public function fillAdminBox($path, $settingGroup, &$box, &$fields, &$values) {
 			}
 		}
 		
-		//Set up the primary key from the requests given
-		if ($box['key']['id'] && !$box['key']['cID']) {
-			ze\content::getCIDAndCTypeFromTagId($box['key']['cID'], $box['key']['cType'], $box['key']['id']);
-		}
 		
-		$content =
-			ze\row::get(
-				'content_items',
-				['id', 'type', 'tag_id', 'language_id', 'equiv_id', 'alias', 'visitor_version', 'admin_version', 'status'],
-				['id' => $box['key']['cID'], 'type' => $box['key']['cType']]);
+		if ($total == 1) {
+			//Set up the primary key from the requests given
+			if ($box['key']['id'] && !$box['key']['cID']) {
+				ze\content::getCIDAndCTypeFromTagId($box['key']['cID'], $box['key']['cType'], $box['key']['id']);
+			}
+		
+			$content =
+				ze\row::get(
+					'content_items',
+					['id', 'type', 'tag_id', 'language_id', 'equiv_id', 'alias', 'visitor_version', 'admin_version', 'status'],
+					['id' => $box['key']['cID'], 'type' => $box['key']['cType']]);
+		
+			$box['identifier']['css_class'] = ze\contentAdm::getItemIconClass($content['id'], $content['type'], true, $content['status']);
+		
+		} else {
+			unset($box['identifier']);
+			
+			$fields['layout/desc']['snippet']['html'] =
+				$fields['layout/desc']['snippet']['html_multi'];
+		}
+		unset($fields['layout/desc']['snippet']['html_multi']);
 		
-		$box['identifier']['css_class'] = ze\contentAdm::getItemIconClass($content['id'], $content['type'], true, $content['status']);
 		
 		if (!$canEdit) {
 			$box['tabs']['cant_edit']['hidden'] = false;
 		
 		} elseif (!$box['key']['cType']) {
 			$box['tabs']['mix_of_types']['hidden'] = false;
+			$box['tab'] = 'mix_of_types';
 		
 		} else {
 			$box['tabs']['layout']['hidden'] = false;
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/content_type_details.php b/zenario/modules/zenario_common_features/classes/admin_boxes/content_type_details.php
index 50b4b2c28..0b7ebd80b 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/content_type_details.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/content_type_details.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/create_vlp.php b/zenario/modules/zenario_common_features/classes/admin_boxes/create_vlp.php
index 44ab2d6fb..cbe606cff 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/create_vlp.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/create_vlp.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/custom_dataset.php b/zenario/modules/zenario_common_features/classes/admin_boxes/custom_dataset.php
index 4e9f53095..aff8a8a3b 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/custom_dataset.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/custom_dataset.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/delete_draft.php b/zenario/modules/zenario_common_features/classes/admin_boxes/delete_draft.php
index a38d5d648..bb3e94457 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/delete_draft.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/delete_draft.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/delete_language.php b/zenario/modules/zenario_common_features/classes/admin_boxes/delete_language.php
index 15e53ebf1..27a382447 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/delete_language.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/delete_language.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/document_folder.php b/zenario/modules/zenario_common_features/classes/admin_boxes/document_folder.php
index a065b61b3..f106beeec 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/document_folder.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/document_folder.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/document_move.php b/zenario/modules/zenario_common_features/classes/admin_boxes/document_move.php
index 7e6835fa9..25bd82a47 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/document_move.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/document_move.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/document_properties.php b/zenario/modules/zenario_common_features/classes/admin_boxes/document_properties.php
index d972d0958..52f548045 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/document_properties.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/document_properties.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/document_rename.php b/zenario/modules/zenario_common_features/classes/admin_boxes/document_rename.php
index c10877faf..a72b2eb82 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/document_rename.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/document_rename.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/document_rule.php b/zenario/modules/zenario_common_features/classes/admin_boxes/document_rule.php
index 16335c7e6..698ac4d25 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/document_rule.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/document_rule.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/document_tag.php b/zenario/modules/zenario_common_features/classes/admin_boxes/document_tag.php
index 7fb3474e6..82e4c900c 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/document_tag.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/document_tag.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/document_upload.php b/zenario/modules/zenario_common_features/classes/admin_boxes/document_upload.php
index 72b5a5979..296844101 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/document_upload.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/document_upload.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/download_sample_file.php b/zenario/modules/zenario_common_features/classes/admin_boxes/download_sample_file.php
index 1037a5298..51bd2354c 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/download_sample_file.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/download_sample_file.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/duplicate_plugin.php b/zenario/modules/zenario_common_features/classes/admin_boxes/duplicate_plugin.php
index c0705b6d3..2beb9567a 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/duplicate_plugin.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/duplicate_plugin.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/enable_site.php b/zenario/modules/zenario_common_features/classes/admin_boxes/enable_site.php
index 1aa67b64e..47a9b476e 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/enable_site.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/enable_site.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/export_content_items.php b/zenario/modules/zenario_common_features/classes/admin_boxes/export_content_items.php
index a01d3167f..31710cb18 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/export_content_items.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/export_content_items.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/export_dataset.php b/zenario/modules/zenario_common_features/classes/admin_boxes/export_dataset.php
index 968b6e71c..16924cb67 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/export_dataset.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/export_dataset.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/export_vlp.php b/zenario/modules/zenario_common_features/classes/admin_boxes/export_vlp.php
index 52534b78c..6c0179a8c 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/export_vlp.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/export_vlp.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/file_type.php b/zenario/modules/zenario_common_features/classes/admin_boxes/file_type.php
index 85d65ee41..fc54cf643 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/file_type.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/file_type.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/head_foot_slot.php b/zenario/modules/zenario_common_features/classes/admin_boxes/head_foot_slot.php
index cf9be3a14..1e037c1cf 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/head_foot_slot.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/head_foot_slot.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/help_line.php b/zenario/modules/zenario_common_features/classes/admin_boxes/help_line.php
index 278834a6e..b5fadb03f 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/help_line.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/help_line.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/image.php b/zenario/modules/zenario_common_features/classes/admin_boxes/image.php
index ef5572a93..3ca0e737e 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/image.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/image.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/image_tag.php b/zenario/modules/zenario_common_features/classes/admin_boxes/image_tag.php
index f37525868..194d8f531 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/image_tag.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/image_tag.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/import.php b/zenario/modules/zenario_common_features/classes/admin_boxes/import.php
index c422c4e93..1c27bef6a 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/import.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/import.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/layout.php b/zenario/modules/zenario_common_features/classes/admin_boxes/layout.php
index 72e6440a1..9fc3e8685 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/layout.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/layout.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -90,7 +90,7 @@ public function fillAdminBox($path, $settingGroup, &$box, &$fields, &$values) {
 						ON civ.id = ci.id
 						AND ci.admin_version = civ.version
 						AND ci.type = civ.type
-					WHERE civ.layout_id = ' . $details['layout_id'];
+					WHERE civ.layout_id = '. (int) $details['layout_id'];
 				
 				$result = ze\sql::select($sql);
 				$contentItem = (ze\sql::fetchAssoc($result));
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/menu.php b/zenario/modules/zenario_common_features/classes/admin_boxes/menu.php
index 266b6a7e8..148315e1d 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/menu.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/menu.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/menu_text.php b/zenario/modules/zenario_common_features/classes/admin_boxes/menu_text.php
index 691718060..cd3208762 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/menu_text.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/menu_text.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/migrate_old_documents.php b/zenario/modules/zenario_common_features/classes/admin_boxes/migrate_old_documents.php
index 23a86e166..34edb4945 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/migrate_old_documents.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/migrate_old_documents.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/page_preview_size.php b/zenario/modules/zenario_common_features/classes/admin_boxes/page_preview_size.php
index a4c7647aa..34977c9b1 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/page_preview_size.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/page_preview_size.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/phrase.php b/zenario/modules/zenario_common_features/classes/admin_boxes/phrase.php
index 8328950c1..5d0ef17a4 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/phrase.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/phrase.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/plugin_settings.php b/zenario/modules/zenario_common_features/classes/admin_boxes/plugin_settings.php
index c3dbe21fb..a59e72176 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/plugin_settings.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/plugin_settings.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/publish.php b/zenario/modules/zenario_common_features/classes/admin_boxes/publish.php
index 97d0f28fb..80d225968 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/publish.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/publish.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -97,7 +97,7 @@ public function fillAdminBox($path, $settingGroup, &$box, &$fields, &$values) {
 			$pIdArr = $pId[1];
 		}
 		$checkIfPublishsql = "SELECT id,scheduled_publish_datetime from ". DB_PREFIX. "content_item_versions 
-					WHERE id IN (". ze\escape::in($pIdArr, 'checkIfPublishsql'). ")
+					WHERE id IN (". ze\escape::in($pIdArr, true). ")
 			  AND scheduled_publish_datetime IS NOT NULL
 			  AND published_datetime IS NULL AND publisher_id=0" ;
 		$checkIfPublish = ze\sql::select($checkIfPublishsql);
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/reorder_documents.php b/zenario/modules/zenario_common_features/classes/admin_boxes/reorder_documents.php
index 64f149576..693f39aa0 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/reorder_documents.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/reorder_documents.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/salutation.php b/zenario/modules/zenario_common_features/classes/admin_boxes/salutation.php
index c6381867c..d45f7bd6a 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/salutation.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/salutation.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/setup_language.php b/zenario/modules/zenario_common_features/classes/admin_boxes/setup_language.php
index 7f62dba80..efc254084 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/setup_language.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/setup_language.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/setup_module.php b/zenario/modules/zenario_common_features/classes/admin_boxes/setup_module.php
index af6340b78..ca2d8d06c 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/setup_module.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/setup_module.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/site_reset.php b/zenario/modules/zenario_common_features/classes/admin_boxes/site_reset.php
index e570a2b38..50843aecd 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/site_reset.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/site_reset.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/site_settings.php b/zenario/modules/zenario_common_features/classes/admin_boxes/site_settings.php
index 359226981..091747b3e 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/site_settings.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/site_settings.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/skin_editor.php b/zenario/modules/zenario_common_features/classes/admin_boxes/skin_editor.php
index 803ac4187..02cf33ba6 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/skin_editor.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/skin_editor.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/spare_domains.php b/zenario/modules/zenario_common_features/classes/admin_boxes/spare_domains.php
index 0517597dc..bee5139b4 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/spare_domains.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/spare_domains.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/styles_fab_black.php b/zenario/modules/zenario_common_features/classes/admin_boxes/styles_fab_black.php
index a4f632b19..7d969812e 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/styles_fab_black.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/styles_fab_black.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/styles_fab_white.php b/zenario/modules/zenario_common_features/classes/admin_boxes/styles_fab_white.php
index e8631c898..49c7870c4 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/styles_fab_white.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/styles_fab_white.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/translate_phrase.php b/zenario/modules/zenario_common_features/classes/admin_boxes/translate_phrase.php
index c1f660cd9..8b467db1e 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/translate_phrase.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/translate_phrase.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/trash.php b/zenario/modules/zenario_common_features/classes/admin_boxes/trash.php
index ff6365959..118ed1989 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/trash.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/trash.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/trash_admin.php b/zenario/modules/zenario_common_features/classes/admin_boxes/trash_admin.php
index 9a32a0e5a..5363336b6 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/trash_admin.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/trash_admin.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/tuix_snippet.php b/zenario/modules/zenario_common_features/classes/admin_boxes/tuix_snippet.php
index 3971850a4..b02cdb903 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/tuix_snippet.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/tuix_snippet.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/upload_replacement_document.php b/zenario/modules/zenario_common_features/classes/admin_boxes/upload_replacement_document.php
index f62c4d5d4..3fdad3fdd 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/upload_replacement_document.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/upload_replacement_document.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/admin_boxes/view_source_code.php b/zenario/modules/zenario_common_features/classes/admin_boxes/view_source_code.php
index 4d91cfc08..1f6ab5460 100644
--- a/zenario/modules/zenario_common_features/classes/admin_boxes/view_source_code.php
+++ b/zenario/modules/zenario_common_features/classes/admin_boxes/view_source_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/organizer/administrators.php b/zenario/modules/zenario_common_features/classes/organizer/administrators.php
index 93220e984..b68ca9f18 100644
--- a/zenario/modules/zenario_common_features/classes/organizer/administrators.php
+++ b/zenario/modules/zenario_common_features/classes/organizer/administrators.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -112,7 +112,7 @@ public function fillOrganizerPanel($path, &$panel, $refinerName, $refinerId, $mo
 							$sqlCode = "
 								Select value FROM ". DB_PREFIX. "admin_settings
 								WHERE name LIKE 'COOKIE_ADMIN_SECURITY_CODE_%'
-								  AND admin_id ='". $id. "'";
+								  AND admin_id = ". (int) $id;
 								  $sqlCodeResult = ze\sql::select($sqlCode);
 								  $sqlCodeRow = ze\sql::fetchAssoc($sqlCodeResult);
 								  if($sqlCodeRow['value'])
diff --git a/zenario/modules/zenario_common_features/classes/organizer/background_images.php b/zenario/modules/zenario_common_features/classes/organizer/background_images.php
index 32dddb24a..26e0f7fbe 100644
--- a/zenario/modules/zenario_common_features/classes/organizer/background_images.php
+++ b/zenario/modules/zenario_common_features/classes/organizer/background_images.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/organizer/backups.php b/zenario/modules/zenario_common_features/classes/organizer/backups.php
index c352ef748..e124e4f6d 100644
--- a/zenario/modules/zenario_common_features/classes/organizer/backups.php
+++ b/zenario/modules/zenario_common_features/classes/organizer/backups.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -107,8 +107,8 @@ public function handleOrganizerPanelAJAX($path, $ids, $ids2, $refinerName, $refi
 			
 			$filename = $_FILES['Filedata']['name'];
 			$ext = pathinfo($filename, PATHINFO_EXTENSION);
-			if (!in_array($ext, ['sql', 'gz'])) {
-				echo '<!--Message_Type:Error-->Only .sql or .gz files can be uploaded as database backups';
+			if (!in_array($ext, ['sql', 'gz', 'encrypted'])) {
+				echo '<!--Message_Type:Error-->Only .sql, .gz, or .encrypted files can be uploaded as database backups';
 			} elseif (file_exists(ze::setting('backup_dir') . '/'. $_FILES['Filedata']['name'])) {
 				echo '<!--Message_Type:Error-->A database backup with the same name already exists';
 			} elseif (\ze\fileAdm::moveUploadedFile($_FILES['Filedata']['tmp_name'], ze::setting('backup_dir') . '/'. $_FILES['Filedata']['name'])) {
diff --git a/zenario/modules/zenario_common_features/classes/organizer/by_language.php b/zenario/modules/zenario_common_features/classes/organizer/by_language.php
index c311b4538..8d90f74bc 100644
--- a/zenario/modules/zenario_common_features/classes/organizer/by_language.php
+++ b/zenario/modules/zenario_common_features/classes/organizer/by_language.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/organizer/categories.php b/zenario/modules/zenario_common_features/classes/organizer/categories.php
index b07c315dc..e744dc14b 100644
--- a/zenario/modules/zenario_common_features/classes/organizer/categories.php
+++ b/zenario/modules/zenario_common_features/classes/organizer/categories.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/organizer/chained.php b/zenario/modules/zenario_common_features/classes/organizer/chained.php
index e5dca2adc..a8274c270 100644
--- a/zenario/modules/zenario_common_features/classes/organizer/chained.php
+++ b/zenario/modules/zenario_common_features/classes/organizer/chained.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/organizer/content.php b/zenario/modules/zenario_common_features/classes/organizer/content.php
index 9490e7371..6edfc46d0 100644
--- a/zenario/modules/zenario_common_features/classes/organizer/content.php
+++ b/zenario/modules/zenario_common_features/classes/organizer/content.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/organizer/content_types.php b/zenario/modules/zenario_common_features/classes/organizer/content_types.php
index 6ed3c077a..9e2ebcae1 100644
--- a/zenario/modules/zenario_common_features/classes/organizer/content_types.php
+++ b/zenario/modules/zenario_common_features/classes/organizer/content_types.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/organizer/custom_datasets.php b/zenario/modules/zenario_common_features/classes/organizer/custom_datasets.php
index b2bfe4866..2aeccab0e 100644
--- a/zenario/modules/zenario_common_features/classes/organizer/custom_datasets.php
+++ b/zenario/modules/zenario_common_features/classes/organizer/custom_datasets.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/organizer/custom_fields.php b/zenario/modules/zenario_common_features/classes/organizer/custom_fields.php
index 4e4a1f2da..a9c3770fc 100644
--- a/zenario/modules/zenario_common_features/classes/organizer/custom_fields.php
+++ b/zenario/modules/zenario_common_features/classes/organizer/custom_fields.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/organizer/custom_tabs_and_fields_gui.php b/zenario/modules/zenario_common_features/classes/organizer/custom_tabs_and_fields_gui.php
index f470be2a0..d8778abb1 100644
--- a/zenario/modules/zenario_common_features/classes/organizer/custom_tabs_and_fields_gui.php
+++ b/zenario/modules/zenario_common_features/classes/organizer/custom_tabs_and_fields_gui.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/organizer/dataset_files.php b/zenario/modules/zenario_common_features/classes/organizer/dataset_files.php
index e07004485..94bc72e2e 100644
--- a/zenario/modules/zenario_common_features/classes/organizer/dataset_files.php
+++ b/zenario/modules/zenario_common_features/classes/organizer/dataset_files.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/organizer/document_folders.php b/zenario/modules/zenario_common_features/classes/organizer/document_folders.php
index 787bdb0cb..164d7467b 100644
--- a/zenario/modules/zenario_common_features/classes/organizer/document_folders.php
+++ b/zenario/modules/zenario_common_features/classes/organizer/document_folders.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/organizer/document_rules.php b/zenario/modules/zenario_common_features/classes/organizer/document_rules.php
index a68f585b5..87d763898 100644
--- a/zenario/modules/zenario_common_features/classes/organizer/document_rules.php
+++ b/zenario/modules/zenario_common_features/classes/organizer/document_rules.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/organizer/document_tags.php b/zenario/modules/zenario_common_features/classes/organizer/document_tags.php
index df260ab5d..137e6c0bb 100644
--- a/zenario/modules/zenario_common_features/classes/organizer/document_tags.php
+++ b/zenario/modules/zenario_common_features/classes/organizer/document_tags.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/organizer/documents.php b/zenario/modules/zenario_common_features/classes/organizer/documents.php
index 285386354..8bc60bece 100644
--- a/zenario/modules/zenario_common_features/classes/organizer/documents.php
+++ b/zenario/modules/zenario_common_features/classes/organizer/documents.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/organizer/file_types.php b/zenario/modules/zenario_common_features/classes/organizer/file_types.php
index 93109798f..f413339ac 100644
--- a/zenario/modules/zenario_common_features/classes/organizer/file_types.php
+++ b/zenario/modules/zenario_common_features/classes/organizer/file_types.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/organizer/image_library.php b/zenario/modules/zenario_common_features/classes/organizer/image_library.php
index 4599c5642..a689c98a9 100644
--- a/zenario/modules/zenario_common_features/classes/organizer/image_library.php
+++ b/zenario/modules/zenario_common_features/classes/organizer/image_library.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/organizer/image_tags.php b/zenario/modules/zenario_common_features/classes/organizer/image_tags.php
index b3ed44c31..ce7103e40 100644
--- a/zenario/modules/zenario_common_features/classes/organizer/image_tags.php
+++ b/zenario/modules/zenario_common_features/classes/organizer/image_tags.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/organizer/language_equivs.php b/zenario/modules/zenario_common_features/classes/organizer/language_equivs.php
index ae6246e3f..754716100 100644
--- a/zenario/modules/zenario_common_features/classes/organizer/language_equivs.php
+++ b/zenario/modules/zenario_common_features/classes/organizer/language_equivs.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/organizer/languages.php b/zenario/modules/zenario_common_features/classes/organizer/languages.php
index 52bbafd0f..7bb3ee1e7 100644
--- a/zenario/modules/zenario_common_features/classes/organizer/languages.php
+++ b/zenario/modules/zenario_common_features/classes/organizer/languages.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/organizer/layouts.php b/zenario/modules/zenario_common_features/classes/organizer/layouts.php
index 1c8d74990..3c2050235 100644
--- a/zenario/modules/zenario_common_features/classes/organizer/layouts.php
+++ b/zenario/modules/zenario_common_features/classes/organizer/layouts.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/organizer/loading_message.php b/zenario/modules/zenario_common_features/classes/organizer/loading_message.php
index a683151b2..a0b455cfa 100644
--- a/zenario/modules/zenario_common_features/classes/organizer/loading_message.php
+++ b/zenario/modules/zenario_common_features/classes/organizer/loading_message.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/organizer/menu_nodes.php b/zenario/modules/zenario_common_features/classes/organizer/menu_nodes.php
index 0bc3fd9f7..e4c69cb29 100644
--- a/zenario/modules/zenario_common_features/classes/organizer/menu_nodes.php
+++ b/zenario/modules/zenario_common_features/classes/organizer/menu_nodes.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/organizer/menu_position.php b/zenario/modules/zenario_common_features/classes/organizer/menu_position.php
index 26949c71f..7e370cad4 100644
--- a/zenario/modules/zenario_common_features/classes/organizer/menu_position.php
+++ b/zenario/modules/zenario_common_features/classes/organizer/menu_position.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/organizer/modules.php b/zenario/modules/zenario_common_features/classes/organizer/modules.php
index 83e54e96a..d2ccd84ee 100644
--- a/zenario/modules/zenario_common_features/classes/organizer/modules.php
+++ b/zenario/modules/zenario_common_features/classes/organizer/modules.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/organizer/page_preview_sizes.php b/zenario/modules/zenario_common_features/classes/organizer/page_preview_sizes.php
index e51c59675..b8d2025ef 100644
--- a/zenario/modules/zenario_common_features/classes/organizer/page_preview_sizes.php
+++ b/zenario/modules/zenario_common_features/classes/organizer/page_preview_sizes.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/organizer/phrases.php b/zenario/modules/zenario_common_features/classes/organizer/phrases.php
index 194ae4150..50decaeb8 100644
--- a/zenario/modules/zenario_common_features/classes/organizer/phrases.php
+++ b/zenario/modules/zenario_common_features/classes/organizer/phrases.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/organizer/plugins.php b/zenario/modules/zenario_common_features/classes/organizer/plugins.php
index 78c3b7e2a..b5382502b 100644
--- a/zenario/modules/zenario_common_features/classes/organizer/plugins.php
+++ b/zenario/modules/zenario_common_features/classes/organizer/plugins.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -322,7 +322,7 @@ public function handleOrganizerPanelAJAX($path, $ids, $ids2, $refinerName, $refi
 		if ($path != 'zenario__modules/panels/plugins') return;
 		
 		if (($_POST['delete'] ?? false) && ze\priv::check('_PRIV_MANAGE_REUSABLE_PLUGIN')) {
-			foreach (ze\ray::explodeAndTrim($ids) as $id) {
+			foreach (ze\ray::explodeAndTrim($ids, true) as $id) {
 				ze\pluginAdm::delete($id);
 			}
 		}
diff --git a/zenario/modules/zenario_common_features/classes/organizer/salutations.php b/zenario/modules/zenario_common_features/classes/organizer/salutations.php
index 2caab28d6..aa01fd17d 100644
--- a/zenario/modules/zenario_common_features/classes/organizer/salutations.php
+++ b/zenario/modules/zenario_common_features/classes/organizer/salutations.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/organizer/sections.php b/zenario/modules/zenario_common_features/classes/organizer/sections.php
index a3918a6df..c15889df4 100644
--- a/zenario/modules/zenario_common_features/classes/organizer/sections.php
+++ b/zenario/modules/zenario_common_features/classes/organizer/sections.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/organizer/site_settings.php b/zenario/modules/zenario_common_features/classes/organizer/site_settings.php
index 851468631..5a66d3694 100644
--- a/zenario/modules/zenario_common_features/classes/organizer/site_settings.php
+++ b/zenario/modules/zenario_common_features/classes/organizer/site_settings.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/organizer/skin_files.php b/zenario/modules/zenario_common_features/classes/organizer/skin_files.php
index 9c5dc96b9..615151321 100644
--- a/zenario/modules/zenario_common_features/classes/organizer/skin_files.php
+++ b/zenario/modules/zenario_common_features/classes/organizer/skin_files.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/organizer/skins.php b/zenario/modules/zenario_common_features/classes/organizer/skins.php
index bba3a7a65..1f7c6f3ec 100644
--- a/zenario/modules/zenario_common_features/classes/organizer/skins.php
+++ b/zenario/modules/zenario_common_features/classes/organizer/skins.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/organizer/slots.php b/zenario/modules/zenario_common_features/classes/organizer/slots.php
index 66c1298ba..6822539c7 100644
--- a/zenario/modules/zenario_common_features/classes/organizer/slots.php
+++ b/zenario/modules/zenario_common_features/classes/organizer/slots.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/organizer/spare_domains.php b/zenario/modules/zenario_common_features/classes/organizer/spare_domains.php
index d620ad8fa..e9ed7d415 100644
--- a/zenario/modules/zenario_common_features/classes/organizer/spare_domains.php
+++ b/zenario/modules/zenario_common_features/classes/organizer/spare_domains.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/organizer/start_page.php b/zenario/modules/zenario_common_features/classes/organizer/start_page.php
index 3b9826cdb..79d898038 100644
--- a/zenario/modules/zenario_common_features/classes/organizer/start_page.php
+++ b/zenario/modules/zenario_common_features/classes/organizer/start_page.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/organizer/template_families.php b/zenario/modules/zenario_common_features/classes/organizer/template_families.php
index f44587195..b9d83ad33 100644
--- a/zenario/modules/zenario_common_features/classes/organizer/template_families.php
+++ b/zenario/modules/zenario_common_features/classes/organizer/template_families.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/organizer/tuix_snippets.php b/zenario/modules/zenario_common_features/classes/organizer/tuix_snippets.php
index af960aa98..25c998b49 100644
--- a/zenario/modules/zenario_common_features/classes/organizer/tuix_snippets.php
+++ b/zenario/modules/zenario_common_features/classes/organizer/tuix_snippets.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/organizer/view_frameworks.php b/zenario/modules/zenario_common_features/classes/organizer/view_frameworks.php
index 9d01d017b..fad491cea 100644
--- a/zenario/modules/zenario_common_features/classes/organizer/view_frameworks.php
+++ b/zenario/modules/zenario_common_features/classes/organizer/view_frameworks.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/classes/visitor/slot_plugin_and_mode.php b/zenario/modules/zenario_common_features/classes/visitor/slot_plugin_and_mode.php
index 284410013..ce07e2118 100644
--- a/zenario/modules/zenario_common_features/classes/visitor/slot_plugin_and_mode.php
+++ b/zenario/modules/zenario_common_features/classes/visitor/slot_plugin_and_mode.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/db_updates/document_dataset.inc.php b/zenario/modules/zenario_common_features/db_updates/document_dataset.inc.php
index c850051a4..206dba042 100644
--- a/zenario/modules/zenario_common_features/db_updates/document_dataset.inc.php
+++ b/zenario/modules/zenario_common_features/db_updates/document_dataset.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/db_updates/email_templates.inc.php b/zenario/modules/zenario_common_features/db_updates/email_templates.inc.php
index b40b62277..197baebac 100644
--- a/zenario/modules/zenario_common_features/db_updates/email_templates.inc.php
+++ b/zenario/modules/zenario_common_features/db_updates/email_templates.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/db_updates/updates.inc.php b/zenario/modules/zenario_common_features/db_updates/updates.inc.php
index f0530683a..3e3406278 100644
--- a/zenario/modules/zenario_common_features/db_updates/updates.inc.php
+++ b/zenario/modules/zenario_common_features/db_updates/updates.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/edition_includes/publishContent.php b/zenario/modules/zenario_common_features/edition_includes/publishContent.php
index 8e641a60c..9c456456a 100644
--- a/zenario/modules/zenario_common_features/edition_includes/publishContent.php
+++ b/zenario/modules/zenario_common_features/edition_includes/publishContent.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/fun/deleteCategory.php b/zenario/modules/zenario_common_features/fun/deleteCategory.php
index a20b90f60..7141642a1 100644
--- a/zenario/modules/zenario_common_features/fun/deleteCategory.php
+++ b/zenario/modules/zenario_common_features/fun/deleteCategory.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/fun/fillAdminToolbar.php b/zenario/modules/zenario_common_features/fun/fillAdminToolbar.php
index a805202ef..fffceb38e 100644
--- a/zenario/modules/zenario_common_features/fun/fillAdminToolbar.php
+++ b/zenario/modules/zenario_common_features/fun/fillAdminToolbar.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/fun/fillAllAdminSlotControls.php b/zenario/modules/zenario_common_features/fun/fillAllAdminSlotControls.php
index a947db4e7..fbcdfd120 100644
--- a/zenario/modules/zenario_common_features/fun/fillAllAdminSlotControls.php
+++ b/zenario/modules/zenario_common_features/fun/fillAllAdminSlotControls.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/fun/fillOrganizerNav.php b/zenario/modules/zenario_common_features/fun/fillOrganizerNav.php
index fe7cfff21..ae8d2f8e1 100644
--- a/zenario/modules/zenario_common_features/fun/fillOrganizerNav.php
+++ b/zenario/modules/zenario_common_features/fun/fillOrganizerNav.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/fun/getTranslationsAndPluginsLinkingToThisContentItem.php b/zenario/modules/zenario_common_features/fun/getTranslationsAndPluginsLinkingToThisContentItem.php
index 5180e66b8..d785290c0 100644
--- a/zenario/modules/zenario_common_features/fun/getTranslationsAndPluginsLinkingToThisContentItem.php
+++ b/zenario/modules/zenario_common_features/fun/getTranslationsAndPluginsLinkingToThisContentItem.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/fun/handleAJAX.php b/zenario/modules/zenario_common_features/fun/handleAJAX.php
index 7141ca326..f5a84f203 100644
--- a/zenario/modules/zenario_common_features/fun/handleAJAX.php
+++ b/zenario/modules/zenario_common_features/fun/handleAJAX.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/fun/handleAdminToolbarAJAX.php b/zenario/modules/zenario_common_features/fun/handleAdminToolbarAJAX.php
index e2d62c5f9..001ad46c4 100644
--- a/zenario/modules/zenario_common_features/fun/handleAdminToolbarAJAX.php
+++ b/zenario/modules/zenario_common_features/fun/handleAdminToolbarAJAX.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/fun/pageNumbers.php b/zenario/modules/zenario_common_features/fun/pageNumbers.php
index 1bcdd57b8..bc33fd23f 100644
--- a/zenario/modules/zenario_common_features/fun/pageNumbers.php
+++ b/zenario/modules/zenario_common_features/fun/pageNumbers.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/fun/validateCategory.php b/zenario/modules/zenario_common_features/fun/validateCategory.php
index 7babdeaa2..a051580c1 100644
--- a/zenario/modules/zenario_common_features/fun/validateCategory.php
+++ b/zenario/modules/zenario_common_features/fun/validateCategory.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/module_code.php b/zenario/modules/zenario_common_features/module_code.php
index 81c62d749..2b955751a 100644
--- a/zenario/modules/zenario_common_features/module_code.php
+++ b/zenario/modules/zenario_common_features/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_common_features/tuix/admin_boxes/alias.yaml b/zenario/modules/zenario_common_features/tuix/admin_boxes/alias.yaml
index aaad3bfb1..38a7a80f3 100644
--- a/zenario/modules/zenario_common_features/tuix/admin_boxes/alias.yaml
+++ b/zenario/modules/zenario_common_features/tuix/admin_boxes/alias.yaml
@@ -25,7 +25,8 @@ zenario_alias:
                     side_note: |
                         An alias for this content item, and part of its URL.
                         The combination of a content item's alias and its language code is unique.
-                        Lower case only, may not contain spaces or special characters.
+                        Aliases can only contain the letters a-z, numbers, underscores or hyphens.
+                        They may not contain spaces or special characters.
                 a_warning_display:
                     same_row: true
                     snippet:
diff --git a/zenario/modules/zenario_common_features/tuix/organizer/content_chained.yaml b/zenario/modules/zenario_common_features/tuix/organizer/content_chained.yaml
index 96ec5605b..dc295c463 100644
--- a/zenario/modules/zenario_common_features/tuix/organizer/content_chained.yaml
+++ b/zenario/modules/zenario_common_features/tuix/organizer/content_chained.yaml
@@ -380,7 +380,7 @@ zenario__content:
                         path: zenario_publish
                 delete:
                     priv: _PRIV_DELETE_DRAFT
-                    visible_if: |
+                    visible_if_for_all_selected_items: |
                         zenarioA.checkSpecificPerms(id)
                         && item.id != item.equiv_id
                     hide_in_select_mode: true
@@ -414,7 +414,7 @@ zenario__content:
                             delete: 1
                 trash:
                     priv: _PRIV_HIDE_CONTENT_ITEM
-                    visible_if: |
+                    visible_if_for_all_selected_items: |
                         zenarioA.checkSpecificPerms(id)
                         && item.id != item.equiv_id
                     hide_in_select_mode: true
diff --git a/zenario/modules/zenario_common_features/tuix/organizer/content_items.yaml b/zenario/modules/zenario_common_features/tuix/organizer/content_items.yaml
index d10e2561d..59800df94 100644
--- a/zenario/modules/zenario_common_features/tuix/organizer/content_items.yaml
+++ b/zenario/modules/zenario_common_features/tuix/organizer/content_items.yaml
@@ -276,7 +276,7 @@ zenario__content:
                 menunodecounter:
                     ord: 8
                     title: menunodecounter
-                    #hidden: true
+                    hidden: true
                 description:
                     ord: 8
                     title: Description
diff --git a/zenario/modules/zenario_content_list/fun/formatAdminBox.php b/zenario/modules/zenario_content_list/fun/formatAdminBox.php
index 975c13ece..afb3082fd 100644
--- a/zenario/modules/zenario_content_list/fun/formatAdminBox.php
+++ b/zenario/modules/zenario_content_list/fun/formatAdminBox.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_content_list/module_code.php b/zenario/modules/zenario_content_list/module_code.php
index 7f3fa1e1f..1824310ae 100644
--- a/zenario/modules/zenario_content_list/module_code.php
+++ b/zenario/modules/zenario_content_list/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -508,7 +508,7 @@ public function init() {
 				$item['cType'] = $row['type'];
 				$item['cVersion'] = $row['version'];
 				$item['Id'] = $row['type']. '_'. $row['id'];
-				$item['Target_Blank'] = 'target = "_blank"';
+				$item['Target_Blank'] = '';
 				$item['Local_File_Id'] = $row['file_id'];
 				$item['s3_File_Id'] = $row['s3_file_id'];
 				$s3FileDetails = ze\row::get('files', ['size','filename','path'], $row['s3_file_id']);
@@ -931,7 +931,7 @@ public function showSlot() {
 		
 		$downLoadpage = false;
 		$linkResult = [];
-		$fileName = $this->phrase('prepare archive');
+		$fileName = $this->phrase('Prepare zip');
 		$Link = '';
 		$noContent = false;
 		$mainLinkArr = [];
@@ -1087,10 +1087,10 @@ public function showSlot() {
 			'Link' => $Link,
 			'FilenameArr' => ($fileNameArr ?? []),
 			'Empty_Archive' => $noContent,
-			'ARCHIVE_READY_FOR_DOWNLOAD' => $this->phrase('Download zip archive:'),
+			'ARCHIVE_READY_FOR_DOWNLOAD' => $this->phrase('Download zip:'),
 			'NO_CONTENT_ITEMS' => $this->phrase('No documents to download.'),
-			'PREPARING_DOCUMENTS' => $this->phrase('Preparing your zip archive...'),
-			'DOWNLOAD_PREPARE_LABEL' => $this->phrase('Download all documents as a zip archive:'),
+			'PREPARING_DOCUMENTS' => $this->phrase('Preparing your zip file...'),
+			'DOWNLOAD_PREPARE_LABEL' => $this->phrase('Download all documents as a zip file:'),
 			'Download_Page' => $downLoadpage,
 			'Main_Link_Array' => $mainLinkArr,
 			'Main_Link_Slot' => $this->slotName,
@@ -1142,14 +1142,14 @@ public function showSlot() {
 					$sql = '
 						SELECT id,name,parent_id
 						FROM ' . DB_PREFIX . 'categories
-						WHERE public = 1 And id IN (' . ze\escape::in($categoryIds) . ')';
+						WHERE public = 1 And id IN (' . ze\escape::in($categoryIds, true) . ')';
 				}
 				else{
 								
 					$sql = '
 						SELECT id,name,parent_id
 						FROM ' . DB_PREFIX . 'categories
-						WHERE id IN (' . ze\escape::in($categoryIds) . ')';
+						WHERE id IN (' . ze\escape::in($categoryIds, true) . ')';
 				}
 				$result = ze\sql::select($sql);
 			
diff --git a/zenario/modules/zenario_content_notifications/classes/admin_boxes/admin.php b/zenario/modules/zenario_content_notifications/classes/admin_boxes/admin.php
index 82c898bbd..f7ea280fa 100644
--- a/zenario/modules/zenario_content_notifications/classes/admin_boxes/admin.php
+++ b/zenario/modules/zenario_content_notifications/classes/admin_boxes/admin.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_content_notifications/classes/admin_boxes/content_requests.php b/zenario/modules/zenario_content_notifications/classes/admin_boxes/content_requests.php
index f12eb9c4f..961fbdb95 100644
--- a/zenario/modules/zenario_content_notifications/classes/admin_boxes/content_requests.php
+++ b/zenario/modules/zenario_content_notifications/classes/admin_boxes/content_requests.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_content_notifications/classes/admin_boxes/publish.php b/zenario/modules/zenario_content_notifications/classes/admin_boxes/publish.php
index c07eb4f2e..1e9235e3b 100644
--- a/zenario/modules/zenario_content_notifications/classes/admin_boxes/publish.php
+++ b/zenario/modules/zenario_content_notifications/classes/admin_boxes/publish.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_content_notifications/classes/admin_boxes/site_settings.php b/zenario/modules/zenario_content_notifications/classes/admin_boxes/site_settings.php
index 44124b5bb..1bcc63536 100644
--- a/zenario/modules/zenario_content_notifications/classes/admin_boxes/site_settings.php
+++ b/zenario/modules/zenario_content_notifications/classes/admin_boxes/site_settings.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_content_notifications/classes/organizer/content.php b/zenario/modules/zenario_content_notifications/classes/organizer/content.php
index 7eaa94776..bc576a628 100644
--- a/zenario/modules/zenario_content_notifications/classes/organizer/content.php
+++ b/zenario/modules/zenario_content_notifications/classes/organizer/content.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_content_notifications/db_updates/admin_content_notifications.inc.php b/zenario/modules/zenario_content_notifications/db_updates/admin_content_notifications.inc.php
index b5ea215ed..cb3e0588a 100644
--- a/zenario/modules/zenario_content_notifications/db_updates/admin_content_notifications.inc.php
+++ b/zenario/modules/zenario_content_notifications/db_updates/admin_content_notifications.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_content_notifications/module_code.php b/zenario/modules/zenario_content_notifications/module_code.php
index a94238b1d..e87fb53a3 100644
--- a/zenario/modules/zenario_content_notifications/module_code.php
+++ b/zenario/modules/zenario_content_notifications/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_cookie_consent_status/module_code.php b/zenario/modules/zenario_cookie_consent_status/module_code.php
index 73b22ff4c..fcbab43fd 100644
--- a/zenario/modules/zenario_cookie_consent_status/module_code.php
+++ b/zenario/modules/zenario_cookie_consent_status/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_copyright/module_code.php b/zenario/modules/zenario_copyright/module_code.php
index 393055185..dba1b5446 100644
--- a/zenario/modules/zenario_copyright/module_code.php
+++ b/zenario/modules/zenario_copyright/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_country_language_picker/fun/select_country.php b/zenario/modules/zenario_country_language_picker/fun/select_country.php
index 04f6e8b39..b2667ae73 100644
--- a/zenario/modules/zenario_country_language_picker/fun/select_country.php
+++ b/zenario/modules/zenario_country_language_picker/fun/select_country.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_country_language_picker/module_code.php b/zenario/modules/zenario_country_language_picker/module_code.php
index ded2abdd0..b91bd44da 100644
--- a/zenario/modules/zenario_country_language_picker/module_code.php
+++ b/zenario/modules/zenario_country_language_picker/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_country_manager/db_updates/country_manager_countries.inc.php b/zenario/modules/zenario_country_manager/db_updates/country_manager_countries.inc.php
index 830a29ba7..d21cd1c1c 100644
--- a/zenario/modules/zenario_country_manager/db_updates/country_manager_countries.inc.php
+++ b/zenario/modules/zenario_country_manager/db_updates/country_manager_countries.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_country_manager/fun/fillAdminBox.php b/zenario/modules/zenario_country_manager/fun/fillAdminBox.php
index fad3a99fa..dbc2e8675 100644
--- a/zenario/modules/zenario_country_manager/fun/fillAdminBox.php
+++ b/zenario/modules/zenario_country_manager/fun/fillAdminBox.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_country_manager/fun/fillOrganizerPanel.php b/zenario/modules/zenario_country_manager/fun/fillOrganizerPanel.php
index c97ded8b3..a1e9a88c9 100644
--- a/zenario/modules/zenario_country_manager/fun/fillOrganizerPanel.php
+++ b/zenario/modules/zenario_country_manager/fun/fillOrganizerPanel.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_country_manager/fun/handleOrganizerPanelAJAX.php b/zenario/modules/zenario_country_manager/fun/handleOrganizerPanelAJAX.php
index 6babe3dd8..320f2c416 100644
--- a/zenario/modules/zenario_country_manager/fun/handleOrganizerPanelAJAX.php
+++ b/zenario/modules/zenario_country_manager/fun/handleOrganizerPanelAJAX.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_country_manager/fun/saveAdminBox.php b/zenario/modules/zenario_country_manager/fun/saveAdminBox.php
index 0c358a8f1..81c2be91d 100644
--- a/zenario/modules/zenario_country_manager/fun/saveAdminBox.php
+++ b/zenario/modules/zenario_country_manager/fun/saveAdminBox.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_country_manager/fun/validateAdminBox.php b/zenario/modules/zenario_country_manager/fun/validateAdminBox.php
index 69a090f78..ef9803b19 100644
--- a/zenario/modules/zenario_country_manager/fun/validateAdminBox.php
+++ b/zenario/modules/zenario_country_manager/fun/validateAdminBox.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_country_manager/module_code.php b/zenario/modules/zenario_country_manager/module_code.php
index 4b72c7ca2..a9a9e17ff 100644
--- a/zenario/modules/zenario_country_manager/module_code.php
+++ b/zenario/modules/zenario_country_manager/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_crm_form_integration/classes/admin_boxes/crm_field_name.php b/zenario/modules/zenario_crm_form_integration/classes/admin_boxes/crm_field_name.php
index 9557bbf48..85879c16b 100644
--- a/zenario/modules/zenario_crm_form_integration/classes/admin_boxes/crm_field_name.php
+++ b/zenario/modules/zenario_crm_form_integration/classes/admin_boxes/crm_field_name.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_crm_form_integration/classes/admin_boxes/last_crm_request.php b/zenario/modules/zenario_crm_form_integration/classes/admin_boxes/last_crm_request.php
index 85f99f5bb..de2da4ed3 100644
--- a/zenario/modules/zenario_crm_form_integration/classes/admin_boxes/last_crm_request.php
+++ b/zenario/modules/zenario_crm_form_integration/classes/admin_boxes/last_crm_request.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_crm_form_integration/classes/admin_boxes/salesforce_response.php b/zenario/modules/zenario_crm_form_integration/classes/admin_boxes/salesforce_response.php
index 0d0c23add..518135b82 100644
--- a/zenario/modules/zenario_crm_form_integration/classes/admin_boxes/salesforce_response.php
+++ b/zenario/modules/zenario_crm_form_integration/classes/admin_boxes/salesforce_response.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_crm_form_integration/classes/admin_boxes/site_settings.php b/zenario/modules/zenario_crm_form_integration/classes/admin_boxes/site_settings.php
index cdcaaa8c9..be991d165 100644
--- a/zenario/modules/zenario_crm_form_integration/classes/admin_boxes/site_settings.php
+++ b/zenario/modules/zenario_crm_form_integration/classes/admin_boxes/site_settings.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_crm_form_integration/classes/admin_boxes/user_form.php b/zenario/modules/zenario_crm_form_integration/classes/admin_boxes/user_form.php
index 26b25f032..7afe21535 100644
--- a/zenario/modules/zenario_crm_form_integration/classes/admin_boxes/user_form.php
+++ b/zenario/modules/zenario_crm_form_integration/classes/admin_boxes/user_form.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_crm_form_integration/classes/organizer/crm_field_names.php b/zenario/modules/zenario_crm_form_integration/classes/organizer/crm_field_names.php
index 282ab873a..012de79bd 100644
--- a/zenario/modules/zenario_crm_form_integration/classes/organizer/crm_field_names.php
+++ b/zenario/modules/zenario_crm_form_integration/classes/organizer/crm_field_names.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_crm_form_integration/classes/organizer/crm_fields.php b/zenario/modules/zenario_crm_form_integration/classes/organizer/crm_fields.php
index a1105e707..f20558876 100644
--- a/zenario/modules/zenario_crm_form_integration/classes/organizer/crm_fields.php
+++ b/zenario/modules/zenario_crm_form_integration/classes/organizer/crm_fields.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_crm_form_integration/classes/organizer/salesforce_response_log.php b/zenario/modules/zenario_crm_form_integration/classes/organizer/salesforce_response_log.php
index 28ec94ebe..2faf19cd1 100644
--- a/zenario/modules/zenario_crm_form_integration/classes/organizer/salesforce_response_log.php
+++ b/zenario/modules/zenario_crm_form_integration/classes/organizer/salesforce_response_log.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_crm_form_integration/classes/organizer/user_forms.php b/zenario/modules/zenario_crm_form_integration/classes/organizer/user_forms.php
index c0d156224..ca8822cad 100644
--- a/zenario/modules/zenario_crm_form_integration/classes/organizer/user_forms.php
+++ b/zenario/modules/zenario_crm_form_integration/classes/organizer/user_forms.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_crm_form_integration/module_code.php b/zenario/modules/zenario_crm_form_integration/module_code.php
index 8387a6313..68b1c4d14 100644
--- a/zenario/modules/zenario_crm_form_integration/module_code.php
+++ b/zenario/modules/zenario_crm_form_integration/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_ctype_audio/module_code.php b/zenario/modules/zenario_ctype_audio/module_code.php
index e4b720eb1..b3a6c524c 100644
--- a/zenario/modules/zenario_ctype_audio/module_code.php
+++ b/zenario/modules/zenario_ctype_audio/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_ctype_event/module_code.php b/zenario/modules/zenario_ctype_event/module_code.php
index 0c34f72af..59458a305 100644
--- a/zenario/modules/zenario_ctype_event/module_code.php
+++ b/zenario/modules/zenario_ctype_event/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_ctype_news/module_code.php b/zenario/modules/zenario_ctype_news/module_code.php
index 0b7235b98..0c9ccfde1 100644
--- a/zenario/modules/zenario_ctype_news/module_code.php
+++ b/zenario/modules/zenario_ctype_news/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_document_container/module_code.php b/zenario/modules/zenario_document_container/module_code.php
index 73b14861d..cc8e3c9a8 100644
--- a/zenario/modules/zenario_document_container/module_code.php
+++ b/zenario/modules/zenario_document_container/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_document_envelopes_fea/classes/admin_boxes/admin.php b/zenario/modules/zenario_document_envelopes_fea/classes/admin_boxes/admin.php
index 3f3668547..73b00df3e 100644
--- a/zenario/modules/zenario_document_envelopes_fea/classes/admin_boxes/admin.php
+++ b/zenario/modules/zenario_document_envelopes_fea/classes/admin_boxes/admin.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_document_envelopes_fea/classes/admin_boxes/plugin_settings.php b/zenario/modules/zenario_document_envelopes_fea/classes/admin_boxes/plugin_settings.php
index bb82375a0..63e126375 100644
--- a/zenario/modules/zenario_document_envelopes_fea/classes/admin_boxes/plugin_settings.php
+++ b/zenario/modules/zenario_document_envelopes_fea/classes/admin_boxes/plugin_settings.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_document_envelopes_fea/classes/admin_boxes/site_settings.php b/zenario/modules/zenario_document_envelopes_fea/classes/admin_boxes/site_settings.php
index a2bb265e0..4e6350f6b 100644
--- a/zenario/modules/zenario_document_envelopes_fea/classes/admin_boxes/site_settings.php
+++ b/zenario/modules/zenario_document_envelopes_fea/classes/admin_boxes/site_settings.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_document_envelopes_fea/classes/admin_boxes/zenario_document_envelope__details.php b/zenario/modules/zenario_document_envelopes_fea/classes/admin_boxes/zenario_document_envelope__details.php
index d2f88bc9c..d884ea6ed 100644
--- a/zenario/modules/zenario_document_envelopes_fea/classes/admin_boxes/zenario_document_envelope__details.php
+++ b/zenario/modules/zenario_document_envelopes_fea/classes/admin_boxes/zenario_document_envelope__details.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_document_envelopes_fea/classes/admin_boxes/zenario_envelope_language__details.php b/zenario/modules/zenario_document_envelopes_fea/classes/admin_boxes/zenario_envelope_language__details.php
index 77cfd0e92..56866d13b 100644
--- a/zenario/modules/zenario_document_envelopes_fea/classes/admin_boxes/zenario_envelope_language__details.php
+++ b/zenario/modules/zenario_document_envelopes_fea/classes/admin_boxes/zenario_envelope_language__details.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_document_envelopes_fea/classes/organizer/document_envelopes.php b/zenario/modules/zenario_document_envelopes_fea/classes/organizer/document_envelopes.php
index 921b80657..bd6c2d398 100644
--- a/zenario/modules/zenario_document_envelopes_fea/classes/organizer/document_envelopes.php
+++ b/zenario/modules/zenario_document_envelopes_fea/classes/organizer/document_envelopes.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_document_envelopes_fea/classes/organizer/envelope_languages.php b/zenario/modules/zenario_document_envelopes_fea/classes/organizer/envelope_languages.php
index 5218fa667..150c3a506 100644
--- a/zenario/modules/zenario_document_envelopes_fea/classes/organizer/envelope_languages.php
+++ b/zenario/modules/zenario_document_envelopes_fea/classes/organizer/envelope_languages.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_document_envelopes_fea/classes/visitor/create_document_envelope.php b/zenario/modules/zenario_document_envelopes_fea/classes/visitor/create_document_envelope.php
index fe3f31144..8390c58b0 100644
--- a/zenario/modules/zenario_document_envelopes_fea/classes/visitor/create_document_envelope.php
+++ b/zenario/modules/zenario_document_envelopes_fea/classes/visitor/create_document_envelope.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_document_envelopes_fea/classes/visitor/edit_document_envelope.php b/zenario/modules/zenario_document_envelopes_fea/classes/visitor/edit_document_envelope.php
index c9d3a9bd2..c425b93b7 100644
--- a/zenario/modules/zenario_document_envelopes_fea/classes/visitor/edit_document_envelope.php
+++ b/zenario/modules/zenario_document_envelopes_fea/classes/visitor/edit_document_envelope.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_document_envelopes_fea/classes/visitor/list_document_envelopes.php b/zenario/modules/zenario_document_envelopes_fea/classes/visitor/list_document_envelopes.php
index 12d1e639c..f1cb1b83c 100644
--- a/zenario/modules/zenario_document_envelopes_fea/classes/visitor/list_document_envelopes.php
+++ b/zenario/modules/zenario_document_envelopes_fea/classes/visitor/list_document_envelopes.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_document_envelopes_fea/classes/visitor/list_files_in_document_envelope.php b/zenario/modules/zenario_document_envelopes_fea/classes/visitor/list_files_in_document_envelope.php
index 256b20b2a..b8fa9f126 100644
--- a/zenario/modules/zenario_document_envelopes_fea/classes/visitor/list_files_in_document_envelope.php
+++ b/zenario/modules/zenario_document_envelopes_fea/classes/visitor/list_files_in_document_envelope.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_document_envelopes_fea/classes/visitor/no_mode_selected.php b/zenario/modules/zenario_document_envelopes_fea/classes/visitor/no_mode_selected.php
index 05f0ba8d8..b866161d2 100644
--- a/zenario/modules/zenario_document_envelopes_fea/classes/visitor/no_mode_selected.php
+++ b/zenario/modules/zenario_document_envelopes_fea/classes/visitor/no_mode_selected.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_document_envelopes_fea/classes/visitor/upload_file_to_document_envelope.php b/zenario/modules/zenario_document_envelopes_fea/classes/visitor/upload_file_to_document_envelope.php
index 1e7441a0f..de45b81e0 100644
--- a/zenario/modules/zenario_document_envelopes_fea/classes/visitor/upload_file_to_document_envelope.php
+++ b/zenario/modules/zenario_document_envelopes_fea/classes/visitor/upload_file_to_document_envelope.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_document_envelopes_fea/classes/visitor/view_document_envelope.php b/zenario/modules/zenario_document_envelopes_fea/classes/visitor/view_document_envelope.php
index 1a6156657..1888f3744 100644
--- a/zenario/modules/zenario_document_envelopes_fea/classes/visitor/view_document_envelope.php
+++ b/zenario/modules/zenario_document_envelopes_fea/classes/visitor/view_document_envelope.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_document_envelopes_fea/db_updates/custom_dataset.inc.php b/zenario/modules/zenario_document_envelopes_fea/db_updates/custom_dataset.inc.php
index f32da8cfe..bcc327d9c 100644
--- a/zenario/modules/zenario_document_envelopes_fea/db_updates/custom_dataset.inc.php
+++ b/zenario/modules/zenario_document_envelopes_fea/db_updates/custom_dataset.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_document_envelopes_fea/db_updates/updates.inc.php b/zenario/modules/zenario_document_envelopes_fea/db_updates/updates.inc.php
index 3ab7c6c65..1bec8bace 100644
--- a/zenario/modules/zenario_document_envelopes_fea/db_updates/updates.inc.php
+++ b/zenario/modules/zenario_document_envelopes_fea/db_updates/updates.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_document_envelopes_fea/module_code.php b/zenario/modules/zenario_document_envelopes_fea/module_code.php
index 654259a90..371e12111 100644
--- a/zenario/modules/zenario_document_envelopes_fea/module_code.php
+++ b/zenario/modules/zenario_document_envelopes_fea/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_email_a_friend/db_updates/email_template.inc.php b/zenario/modules/zenario_email_a_friend/db_updates/email_template.inc.php
index f76c06d33..62e7f0f19 100644
--- a/zenario/modules/zenario_email_a_friend/db_updates/email_template.inc.php
+++ b/zenario/modules/zenario_email_a_friend/db_updates/email_template.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_email_a_friend/module_code.php b/zenario/modules/zenario_email_a_friend/module_code.php
index db0cf7f55..9b977a6b9 100644
--- a/zenario/modules/zenario_email_a_friend/module_code.php
+++ b/zenario/modules/zenario_email_a_friend/module_code.php
@@ -1,7 +1,7 @@
 <?php
 if (!defined('NOT_ACCESSED_DIRECTLY')) exit('This file may not be directly accessed'); 
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_email_template_manager/db_updates/email_image_conversion.inc.php b/zenario/modules/zenario_email_template_manager/db_updates/email_image_conversion.inc.php
index ef4ca94b6..657d5ca47 100644
--- a/zenario/modules/zenario_email_template_manager/db_updates/email_image_conversion.inc.php
+++ b/zenario/modules/zenario_email_template_manager/db_updates/email_image_conversion.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_email_template_manager/db_updates/email_logs.inc.php b/zenario/modules/zenario_email_template_manager/db_updates/email_logs.inc.php
index 8e428e109..875ea9b8d 100644
--- a/zenario/modules/zenario_email_template_manager/db_updates/email_logs.inc.php
+++ b/zenario/modules/zenario_email_template_manager/db_updates/email_logs.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_email_template_manager/db_updates/updates.inc.php b/zenario/modules/zenario_email_template_manager/db_updates/updates.inc.php
index 49078745f..0f8321923 100644
--- a/zenario/modules/zenario_email_template_manager/db_updates/updates.inc.php
+++ b/zenario/modules/zenario_email_template_manager/db_updates/updates.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_email_template_manager/fun/fillAdminBox.php b/zenario/modules/zenario_email_template_manager/fun/fillAdminBox.php
index a9f0a2872..6ba198550 100644
--- a/zenario/modules/zenario_email_template_manager/fun/fillAdminBox.php
+++ b/zenario/modules/zenario_email_template_manager/fun/fillAdminBox.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_email_template_manager/fun/fillOrganizerPanel.php b/zenario/modules/zenario_email_template_manager/fun/fillOrganizerPanel.php
index 7eea2aaad..9f62db4b8 100644
--- a/zenario/modules/zenario_email_template_manager/fun/fillOrganizerPanel.php
+++ b/zenario/modules/zenario_email_template_manager/fun/fillOrganizerPanel.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_email_template_manager/fun/formatAdminBox.php b/zenario/modules/zenario_email_template_manager/fun/formatAdminBox.php
index eea1106a5..eb87e51df 100644
--- a/zenario/modules/zenario_email_template_manager/fun/formatAdminBox.php
+++ b/zenario/modules/zenario_email_template_manager/fun/formatAdminBox.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_email_template_manager/fun/handleOrganizerPanelAJAX.php b/zenario/modules/zenario_email_template_manager/fun/handleOrganizerPanelAJAX.php
index 9cf256402..eb0f3df56 100644
--- a/zenario/modules/zenario_email_template_manager/fun/handleOrganizerPanelAJAX.php
+++ b/zenario/modules/zenario_email_template_manager/fun/handleOrganizerPanelAJAX.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_email_template_manager/fun/saveAdminBox.php b/zenario/modules/zenario_email_template_manager/fun/saveAdminBox.php
index 77e77f5b7..2c1fd45ec 100644
--- a/zenario/modules/zenario_email_template_manager/fun/saveAdminBox.php
+++ b/zenario/modules/zenario_email_template_manager/fun/saveAdminBox.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_email_template_manager/fun/validateAdminBox.php b/zenario/modules/zenario_email_template_manager/fun/validateAdminBox.php
index 7f1ae346b..84d96ef3e 100644
--- a/zenario/modules/zenario_email_template_manager/fun/validateAdminBox.php
+++ b/zenario/modules/zenario_email_template_manager/fun/validateAdminBox.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_email_template_manager/module_code.php b/zenario/modules/zenario_email_template_manager/module_code.php
index ca057abe1..68cc8c6e8 100644
--- a/zenario/modules/zenario_email_template_manager/module_code.php
+++ b/zenario/modules/zenario_email_template_manager/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_error_log/classes/admin_boxes/clear_error_log.php b/zenario/modules/zenario_error_log/classes/admin_boxes/clear_error_log.php
index d771ba7a0..d96b95f66 100644
--- a/zenario/modules/zenario_error_log/classes/admin_boxes/clear_error_log.php
+++ b/zenario/modules/zenario_error_log/classes/admin_boxes/clear_error_log.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_error_log/classes/admin_boxes/site_settings.php b/zenario/modules/zenario_error_log/classes/admin_boxes/site_settings.php
index fa12546a9..ecefba1b1 100644
--- a/zenario/modules/zenario_error_log/classes/admin_boxes/site_settings.php
+++ b/zenario/modules/zenario_error_log/classes/admin_boxes/site_settings.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_error_log/classes/organizer/error_log.php b/zenario/modules/zenario_error_log/classes/organizer/error_log.php
index 2ad83fad7..04f6ca457 100644
--- a/zenario/modules/zenario_error_log/classes/organizer/error_log.php
+++ b/zenario/modules/zenario_error_log/classes/organizer/error_log.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_error_log/module_code.php b/zenario/modules/zenario_error_log/module_code.php
index 8b225a73f..046cd77d2 100644
--- a/zenario/modules/zenario_error_log/module_code.php
+++ b/zenario/modules/zenario_error_log/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_event_calendar/module_code.php b/zenario/modules/zenario_event_calendar/module_code.php
index 7d9550a12..445015237 100644
--- a/zenario/modules/zenario_event_calendar/module_code.php
+++ b/zenario/modules/zenario_event_calendar/module_code.php
@@ -1,7 +1,7 @@
 <?php
 if (!defined('NOT_ACCESSED_DIRECTLY')) exit('This file may not be directly accessed'); 
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_event_listing/module_code.php b/zenario/modules/zenario_event_listing/module_code.php
index 1a48a42b1..24ef489a5 100644
--- a/zenario/modules/zenario_event_listing/module_code.php
+++ b/zenario/modules/zenario_event_listing/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_event_slideshow/module_code.php b/zenario/modules/zenario_event_slideshow/module_code.php
index 97c888260..f6cf82b18 100644
--- a/zenario/modules/zenario_event_slideshow/module_code.php
+++ b/zenario/modules/zenario_event_slideshow/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_extranet/db_updates/extranet_email_templates.inc.php b/zenario/modules/zenario_extranet/db_updates/extranet_email_templates.inc.php
index 2f9d68e3f..f1d82eb4a 100644
--- a/zenario/modules/zenario_extranet/db_updates/extranet_email_templates.inc.php
+++ b/zenario/modules/zenario_extranet/db_updates/extranet_email_templates.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_extranet/fun/validateFormFields.php b/zenario/modules/zenario_extranet/fun/validateFormFields.php
index d5f8f0310..82032848b 100644
--- a/zenario/modules/zenario_extranet/fun/validateFormFields.php
+++ b/zenario/modules/zenario_extranet/fun/validateFormFields.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_extranet/module_code.php b/zenario/modules/zenario_extranet/module_code.php
index 171d754fc..8b3fa642a 100644
--- a/zenario/modules/zenario_extranet/module_code.php
+++ b/zenario/modules/zenario_extranet/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_extranet_change_email/db_updates/change_address.inc.php b/zenario/modules/zenario_extranet_change_email/db_updates/change_address.inc.php
index c7c0ee36f..7a0753c86 100644
--- a/zenario/modules/zenario_extranet_change_email/db_updates/change_address.inc.php
+++ b/zenario/modules/zenario_extranet_change_email/db_updates/change_address.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_extranet_change_email/module_code.php b/zenario/modules/zenario_extranet_change_email/module_code.php
index 9e068d74a..76abe88d6 100644
--- a/zenario/modules/zenario_extranet_change_email/module_code.php
+++ b/zenario/modules/zenario_extranet_change_email/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_extranet_change_password/db_updates/email_templates.inc.php b/zenario/modules/zenario_extranet_change_password/db_updates/email_templates.inc.php
index ec9bb1dbc..3f7e8ce53 100644
--- a/zenario/modules/zenario_extranet_change_password/db_updates/email_templates.inc.php
+++ b/zenario/modules/zenario_extranet_change_password/db_updates/email_templates.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_extranet_change_password/module_code.php b/zenario/modules/zenario_extranet_change_password/module_code.php
index 62489fed3..75b8f3236 100644
--- a/zenario/modules/zenario_extranet_change_password/module_code.php
+++ b/zenario/modules/zenario_extranet_change_password/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_extranet_logout/module_code.php b/zenario/modules/zenario_extranet_logout/module_code.php
index a6efe09ca..caeadcec2 100644
--- a/zenario/modules/zenario_extranet_logout/module_code.php
+++ b/zenario/modules/zenario_extranet_logout/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_extranet_password_reset/db_updates/extranet_password_reset.inc.php b/zenario/modules/zenario_extranet_password_reset/db_updates/extranet_password_reset.inc.php
index eaf4f0819..b936941db 100644
--- a/zenario/modules/zenario_extranet_password_reset/db_updates/extranet_password_reset.inc.php
+++ b/zenario/modules/zenario_extranet_password_reset/db_updates/extranet_password_reset.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_extranet_password_reset/module_code.php b/zenario/modules/zenario_extranet_password_reset/module_code.php
index 718a23ac2..f2ad31c2a 100644
--- a/zenario/modules/zenario_extranet_password_reset/module_code.php
+++ b/zenario/modules/zenario_extranet_password_reset/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_extranet_profile_edit/module_code.php b/zenario/modules/zenario_extranet_profile_edit/module_code.php
index 93231ac84..1de986a9d 100644
--- a/zenario/modules/zenario_extranet_profile_edit/module_code.php
+++ b/zenario/modules/zenario_extranet_profile_edit/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_extranet_registration/db_updates/extranet_registration.inc.php b/zenario/modules/zenario_extranet_registration/db_updates/extranet_registration.inc.php
index 0d5581466..3e0aaae57 100644
--- a/zenario/modules/zenario_extranet_registration/db_updates/extranet_registration.inc.php
+++ b/zenario/modules/zenario_extranet_registration/db_updates/extranet_registration.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_extranet_registration/module_code.php b/zenario/modules/zenario_extranet_registration/module_code.php
index a6f9f025b..46670677f 100644
--- a/zenario/modules/zenario_extranet_registration/module_code.php
+++ b/zenario/modules/zenario_extranet_registration/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -538,7 +538,7 @@ protected function addUserRecord(){
 			ze::$dbL->checkTableDef($tableName = DB_PREFIX . 'users_custom_data');
 			
 			if ($this->setting('user_custom_fields')) {
-				$result = ze\sql::select("select db_column, type, label from ".DB_PREFIX."custom_dataset_fields where id in (".$this->setting('user_custom_fields').")");
+				$result = ze\sql::select("select db_column, type, label from ".DB_PREFIX."custom_dataset_fields where id in (". ze\escape::in($this->setting('user_custom_fields'), true). ")");
 			
 				// Save custom fields from plugin settings
 				while ($column = ze\sql::fetchAssoc($result)) {
diff --git a/zenario/modules/zenario_extranet_user_image/module_code.php b/zenario/modules/zenario_extranet_user_image/module_code.php
index e9c6ab886..92a0db826 100644
--- a/zenario/modules/zenario_extranet_user_image/module_code.php
+++ b/zenario/modules/zenario_extranet_user_image/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_extranet_user_profile_view/module_code.php b/zenario/modules/zenario_extranet_user_profile_view/module_code.php
index 5d6fb8f19..4e3f9e5b9 100644
--- a/zenario/modules/zenario_extranet_user_profile_view/module_code.php
+++ b/zenario/modules/zenario_extranet_user_profile_view/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_extranet_user_profile_view_2/module_code.php b/zenario/modules/zenario_extranet_user_profile_view_2/module_code.php
index 71db28629..1bc38d12b 100644
--- a/zenario/modules/zenario_extranet_user_profile_view_2/module_code.php
+++ b/zenario/modules/zenario_extranet_user_profile_view_2/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_feed_reader/db_updates/cache.php b/zenario/modules/zenario_feed_reader/db_updates/cache.php
index b68e61f6b..c32441176 100644
--- a/zenario/modules/zenario_feed_reader/db_updates/cache.php
+++ b/zenario/modules/zenario_feed_reader/db_updates/cache.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_feed_reader/module_code.php b/zenario/modules/zenario_feed_reader/module_code.php
index 6e7cfff81..906b74e8f 100644
--- a/zenario/modules/zenario_feed_reader/module_code.php
+++ b/zenario/modules/zenario_feed_reader/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_font_size/js/plugin.js b/zenario/modules/zenario_font_size/js/plugin.js
index 9cd3eaca5..fe112f277 100644
--- a/zenario/modules/zenario_font_size/js/plugin.js
+++ b/zenario/modules/zenario_font_size/js/plugin.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_font_size/module_code.php b/zenario/modules/zenario_font_size/module_code.php
index 78a7d4e33..f84cfbbd6 100644
--- a/zenario/modules/zenario_font_size/module_code.php
+++ b/zenario/modules/zenario_font_size/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_footer/module_code.php b/zenario/modules/zenario_footer/module_code.php
index 5c4c28498..d97f4f5e0 100644
--- a/zenario/modules/zenario_footer/module_code.php
+++ b/zenario/modules/zenario_footer/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_forum/db_updates/forum_email_templates.inc.php b/zenario/modules/zenario_forum/db_updates/forum_email_templates.inc.php
index 92c24c45e..8349bb9a8 100644
--- a/zenario/modules/zenario_forum/db_updates/forum_email_templates.inc.php
+++ b/zenario/modules/zenario_forum/db_updates/forum_email_templates.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_forum/db_updates/forum_tables.inc.php b/zenario/modules/zenario_forum/db_updates/forum_tables.inc.php
index ee1f21ef7..2820e5265 100644
--- a/zenario/modules/zenario_forum/db_updates/forum_tables.inc.php
+++ b/zenario/modules/zenario_forum/db_updates/forum_tables.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_forum/fun/addReply.php b/zenario/modules/zenario_forum/fun/addReply.php
index 79522e3d4..2b76c2819 100644
--- a/zenario/modules/zenario_forum/fun/addReply.php
+++ b/zenario/modules/zenario_forum/fun/addReply.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_forum/fun/addThread.php b/zenario/modules/zenario_forum/fun/addThread.php
index db478376f..877a71569 100644
--- a/zenario/modules/zenario_forum/fun/addThread.php
+++ b/zenario/modules/zenario_forum/fun/addThread.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_forum/fun/calcForumPostCount.php b/zenario/modules/zenario_forum/fun/calcForumPostCount.php
index f4b162193..dbce0448b 100644
--- a/zenario/modules/zenario_forum/fun/calcForumPostCount.php
+++ b/zenario/modules/zenario_forum/fun/calcForumPostCount.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_forum/fun/calcThreadPostCount.php b/zenario/modules/zenario_forum/fun/calcThreadPostCount.php
index 7fba9e7cb..d8fed9668 100644
--- a/zenario/modules/zenario_forum/fun/calcThreadPostCount.php
+++ b/zenario/modules/zenario_forum/fun/calcThreadPostCount.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_forum/fun/deletePost.php b/zenario/modules/zenario_forum/fun/deletePost.php
index ac5805632..6c96950bc 100644
--- a/zenario/modules/zenario_forum/fun/deletePost.php
+++ b/zenario/modules/zenario_forum/fun/deletePost.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_forum/fun/deleteThread.php b/zenario/modules/zenario_forum/fun/deleteThread.php
index f5418f4ad..a79d4479b 100644
--- a/zenario/modules/zenario_forum/fun/deleteThread.php
+++ b/zenario/modules/zenario_forum/fun/deleteThread.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_forum/fun/eventUserDeleted.php b/zenario/modules/zenario_forum/fun/eventUserDeleted.php
index b2bb4478e..869b35189 100644
--- a/zenario/modules/zenario_forum/fun/eventUserDeleted.php
+++ b/zenario/modules/zenario_forum/fun/eventUserDeleted.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_forum/fun/fillAdminBox.php b/zenario/modules/zenario_forum/fun/fillAdminBox.php
index f98cecf2c..2f406292b 100644
--- a/zenario/modules/zenario_forum/fun/fillAdminBox.php
+++ b/zenario/modules/zenario_forum/fun/fillAdminBox.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_forum/fun/fillAdminSlotControls.php b/zenario/modules/zenario_forum/fun/fillAdminSlotControls.php
index 48577fa90..e06582493 100644
--- a/zenario/modules/zenario_forum/fun/fillAdminSlotControls.php
+++ b/zenario/modules/zenario_forum/fun/fillAdminSlotControls.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_forum/fun/fillOrganizerPanel.php b/zenario/modules/zenario_forum/fun/fillOrganizerPanel.php
index c1ebcd62f..40a1f8eb2 100644
--- a/zenario/modules/zenario_forum/fun/fillOrganizerPanel.php
+++ b/zenario/modules/zenario_forum/fun/fillOrganizerPanel.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_forum/fun/formatAdminBox.php b/zenario/modules/zenario_forum/fun/formatAdminBox.php
index f13323150..9339e87ca 100644
--- a/zenario/modules/zenario_forum/fun/formatAdminBox.php
+++ b/zenario/modules/zenario_forum/fun/formatAdminBox.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_forum/fun/handleAJAX.php b/zenario/modules/zenario_forum/fun/handleAJAX.php
index a2c3916fd..ce4bb2ed4 100644
--- a/zenario/modules/zenario_forum/fun/handleAJAX.php
+++ b/zenario/modules/zenario_forum/fun/handleAJAX.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_forum/fun/handleOrganizerPanelAJAX.php b/zenario/modules/zenario_forum/fun/handleOrganizerPanelAJAX.php
index 454bdbbc4..46211e9f2 100644
--- a/zenario/modules/zenario_forum/fun/handleOrganizerPanelAJAX.php
+++ b/zenario/modules/zenario_forum/fun/handleOrganizerPanelAJAX.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_forum/fun/markThreadAsRead.php b/zenario/modules/zenario_forum/fun/markThreadAsRead.php
index 5d73d4f49..316ddec25 100644
--- a/zenario/modules/zenario_forum/fun/markThreadAsRead.php
+++ b/zenario/modules/zenario_forum/fun/markThreadAsRead.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_forum/fun/moveThreadIntoForum.php b/zenario/modules/zenario_forum/fun/moveThreadIntoForum.php
index 05118262f..e378944ce 100644
--- a/zenario/modules/zenario_forum/fun/moveThreadIntoForum.php
+++ b/zenario/modules/zenario_forum/fun/moveThreadIntoForum.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_forum/fun/saveAdminBox.php b/zenario/modules/zenario_forum/fun/saveAdminBox.php
index bd22397a9..89ba49372 100644
--- a/zenario/modules/zenario_forum/fun/saveAdminBox.php
+++ b/zenario/modules/zenario_forum/fun/saveAdminBox.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_forum/fun/sendEmailNotification.php b/zenario/modules/zenario_forum/fun/sendEmailNotification.php
index 3f5b48d2d..3a5814a4f 100644
--- a/zenario/modules/zenario_forum/fun/sendEmailNotification.php
+++ b/zenario/modules/zenario_forum/fun/sendEmailNotification.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_forum/fun/validateAdminBox.php b/zenario/modules/zenario_forum/fun/validateAdminBox.php
index 9e25eef1f..82c7a6a74 100644
--- a/zenario/modules/zenario_forum/fun/validateAdminBox.php
+++ b/zenario/modules/zenario_forum/fun/validateAdminBox.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_forum/js/admin.js b/zenario/modules/zenario_forum/js/admin.js
index 87fd26d7c..f0aeafb53 100644
--- a/zenario/modules/zenario_forum/js/admin.js
+++ b/zenario/modules/zenario_forum/js/admin.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_forum/module_code.php b/zenario/modules/zenario_forum/module_code.php
index 4d093d2b8..304615f7d 100644
--- a/zenario/modules/zenario_forum/module_code.php
+++ b/zenario/modules/zenario_forum/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_forum_list/module_code.php b/zenario/modules/zenario_forum_list/module_code.php
index 73901cffe..9ac20f3b1 100644
--- a/zenario/modules/zenario_forum_list/module_code.php
+++ b/zenario/modules/zenario_forum_list/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_forum_search/module_code.php b/zenario/modules/zenario_forum_search/module_code.php
index 859158c6b..44b4f1065 100644
--- a/zenario/modules/zenario_forum_search/module_code.php
+++ b/zenario/modules/zenario_forum_search/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_google_map/fun/showStandalonePage.php b/zenario/modules/zenario_google_map/fun/showStandalonePage.php
index bc7677a07..328b9b00c 100644
--- a/zenario/modules/zenario_google_map/fun/showStandalonePage.php
+++ b/zenario/modules/zenario_google_map/fun/showStandalonePage.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_google_map/module_code.php b/zenario/modules/zenario_google_map/module_code.php
index baf8aa15c..a9c1bccb2 100644
--- a/zenario/modules/zenario_google_map/module_code.php
+++ b/zenario/modules/zenario_google_map/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_html_snippet/module_code.php b/zenario/modules/zenario_html_snippet/module_code.php
index 18539c1d9..745dcfb72 100644
--- a/zenario/modules/zenario_html_snippet/module_code.php
+++ b/zenario/modules/zenario_html_snippet/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_incoming_email_manager/db_updates/accounts.inc.php b/zenario/modules/zenario_incoming_email_manager/db_updates/accounts.inc.php
index acc7c13f5..a7909c191 100644
--- a/zenario/modules/zenario_incoming_email_manager/db_updates/accounts.inc.php
+++ b/zenario/modules/zenario_incoming_email_manager/db_updates/accounts.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_incoming_email_manager/mail/email_handler.php b/zenario/modules/zenario_incoming_email_manager/mail/email_handler.php
index 739083627..0c9ff97d6 100644
--- a/zenario/modules/zenario_incoming_email_manager/mail/email_handler.php
+++ b/zenario/modules/zenario_incoming_email_manager/mail/email_handler.php
@@ -1,7 +1,7 @@
 #!/usr/bin/php -q
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_incoming_email_manager/module_code.php b/zenario/modules/zenario_incoming_email_manager/module_code.php
index 6701d6103..6ead2fe79 100644
--- a/zenario/modules/zenario_incoming_email_manager/module_code.php
+++ b/zenario/modules/zenario_incoming_email_manager/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_language_picker/module_code.php b/zenario/modules/zenario_language_picker/module_code.php
index 6c7c6feb0..7ea3c10a7 100644
--- a/zenario/modules/zenario_language_picker/module_code.php
+++ b/zenario/modules/zenario_language_picker/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_location_listing/module_code.php b/zenario/modules/zenario_location_listing/module_code.php
index 89be92d16..6439370de 100644
--- a/zenario/modules/zenario_location_listing/module_code.php
+++ b/zenario/modules/zenario_location_listing/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_location_manager/db_updates/custom_dataset.inc.php b/zenario/modules/zenario_location_manager/db_updates/custom_dataset.inc.php
index 24cc45d7d..5edcb0432 100644
--- a/zenario/modules/zenario_location_manager/db_updates/custom_dataset.inc.php
+++ b/zenario/modules/zenario_location_manager/db_updates/custom_dataset.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_location_manager/db_updates/locations.inc.php b/zenario/modules/zenario_location_manager/db_updates/locations.inc.php
index 308b78dff..4ab090a6d 100644
--- a/zenario/modules/zenario_location_manager/db_updates/locations.inc.php
+++ b/zenario/modules/zenario_location_manager/db_updates/locations.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_location_manager/module_code.php b/zenario/modules/zenario_location_manager/module_code.php
index 541bc17a9..ed895fcf9 100644
--- a/zenario/modules/zenario_location_manager/module_code.php
+++ b/zenario/modules/zenario_location_manager/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -590,7 +590,7 @@ public function fillAdminBox($path, $settingGroup, &$box, &$fields, &$values) {
 					foreach ($fieldsToCheck as $tuixName => $dbName) {
 						$sql = "SELECT DISTINCT " . ze\escape::sql($dbName) . "
 								FROM " . DB_PREFIX . ZENARIO_LOCATION_MANAGER_PREFIX . "locations
-								WHERE id IN (" . ze\escape::sql($box['key']['id']) . ")
+								WHERE id IN (" . ze\escape::in($box['key']['id'], true) . ")
 								LIMIT 2";
 								
 						$result = ze\sql::select($sql);
@@ -632,7 +632,7 @@ public function fillAdminBox($path, $settingGroup, &$box, &$fields, &$values) {
 							FROM " 
 								. DB_PREFIX . ZENARIO_LOCATION_MANAGER_PREFIX . "locations
 							WHERE 
-								id IN (" . ze\escape::sql($box['key']['id']) . ")
+								id IN (" . ze\escape::in($box['key']['id'], true) . ")
 							LIMIT 2";
 							
 					$result = ze\sql::select($sql);
@@ -663,7 +663,7 @@ public function fillAdminBox($path, $settingGroup, &$box, &$fields, &$values) {
 							FROM ". DB_PREFIX . ZENARIO_LOCATION_MANAGER_PREFIX . "locations AS l
 							INNER JOIN ". DB_PREFIX. ZENARIO_LOCATION_MANAGER_PREFIX . "location_sector_score_link AS lssl
 							   ON l.id = lssl.location_id
-							WHERE lssl.location_id IN (". $box['key']['id']. ")
+							WHERE lssl.location_id IN (". ze\escape::in($box['key']['id'], true). ")
 							GROUP BY lssl.sector_id";
 						$result = ze\sql::select($sql);
 						while ($row = ze\sql::fetchAssoc($result)) {
@@ -1111,7 +1111,7 @@ public function saveAdminBox($path, $settingGroup, &$box, &$fields, &$values, $c
 
 					$sql .= implode(",",$fieldsToChangeSQL);
 							
-					$sql .= " WHERE id IN (" . ze\escape::sql($box['key']['id']) . ")";
+					$sql .= " WHERE id IN (" . ze\escape::in($box['key']['id'], true) . ")";
 					
 					$result = ze\sql::update($sql);
 				}
@@ -1247,7 +1247,7 @@ public function handleOrganizerPanelAJAX($path, $ids, $ids2, $refinerName, $refi
 								if ($organizationFlag) {
 									$sql = ' UPDATE ' . DB_PREFIX . ZENARIO_LOCATION_MANAGER_PREFIX . 'locations_custom_data
 									SET `' . ze\escape::sql($organizationFlag['db_column']) . '` = 0
-									WHERE location_id IN (' . ze\escape::in($ids) . ')';
+									WHERE location_id IN (' . ze\escape::in($ids, true) . ')';
 									ze\sql::update($sql);
 								}
 							}
@@ -1262,7 +1262,7 @@ public function handleOrganizerPanelAJAX($path, $ids, $ids2, $refinerName, $refi
 								if ($organizationFlag) {
 									$sql = ' UPDATE ' . DB_PREFIX . ZENARIO_LOCATION_MANAGER_PREFIX . 'locations_custom_data
 									SET `' . ze\escape::sql($organizationFlag['db_column']) . '` = 1
-									WHERE location_id IN (' . ze\escape::in($ids) . ')';
+									WHERE location_id IN (' . ze\escape::in($ids, true) . ')';
 									ze\sql::update($sql);
 								}
 							}
diff --git a/zenario/modules/zenario_location_map_and_listing/js/plugin.js b/zenario/modules/zenario_location_map_and_listing/js/plugin.js
index 91e958c8f..357b8250f 100644
--- a/zenario/modules/zenario_location_map_and_listing/js/plugin.js
+++ b/zenario/modules/zenario_location_map_and_listing/js/plugin.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_location_map_and_listing/module_code.php b/zenario/modules/zenario_location_map_and_listing/module_code.php
index 4bf284773..fc1c1c97d 100644
--- a/zenario/modules/zenario_location_map_and_listing/module_code.php
+++ b/zenario/modules/zenario_location_map_and_listing/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_location_map_and_listing_2/js/plugin.js b/zenario/modules/zenario_location_map_and_listing_2/js/plugin.js
index 77aef320b..acb9445e9 100644
--- a/zenario/modules/zenario_location_map_and_listing_2/js/plugin.js
+++ b/zenario/modules/zenario_location_map_and_listing_2/js/plugin.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_location_map_and_listing_2/module_code.php b/zenario/modules/zenario_location_map_and_listing_2/module_code.php
index 20e9a1576..f722dd52f 100644
--- a/zenario/modules/zenario_location_map_and_listing_2/module_code.php
+++ b/zenario/modules/zenario_location_map_and_listing_2/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_location_ratings/db_updates/location_ratings.inc.php b/zenario/modules/zenario_location_ratings/db_updates/location_ratings.inc.php
index 15997fd88..eb2ed47f9 100644
--- a/zenario/modules/zenario_location_ratings/db_updates/location_ratings.inc.php
+++ b/zenario/modules/zenario_location_ratings/db_updates/location_ratings.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_location_ratings/module_code.php b/zenario/modules/zenario_location_ratings/module_code.php
index 746aeab88..8b1dade76 100644
--- a/zenario/modules/zenario_location_ratings/module_code.php
+++ b/zenario/modules/zenario_location_ratings/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_location_viewer/module_code.php b/zenario/modules/zenario_location_viewer/module_code.php
index 4bf3c509b..4130cb085 100644
--- a/zenario/modules/zenario_location_viewer/module_code.php
+++ b/zenario/modules/zenario_location_viewer/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_menu/fun/fillAdminBox.php b/zenario/modules/zenario_menu/fun/fillAdminBox.php
index 7f3f1fac1..e9b6a8e49 100644
--- a/zenario/modules/zenario_menu/fun/fillAdminBox.php
+++ b/zenario/modules/zenario_menu/fun/fillAdminBox.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_menu/module_code.php b/zenario/modules/zenario_menu/module_code.php
index 17918b34b..043e007bc 100644
--- a/zenario/modules/zenario_menu/module_code.php
+++ b/zenario/modules/zenario_menu/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_menu_forward_back_navigator/module_code.php b/zenario/modules/zenario_menu_forward_back_navigator/module_code.php
index f179d26ea..dc9019220 100644
--- a/zenario/modules/zenario_menu_forward_back_navigator/module_code.php
+++ b/zenario/modules/zenario_menu_forward_back_navigator/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_menu_multicolumn/db_updates/nodes_top_of_column.php b/zenario/modules/zenario_menu_multicolumn/db_updates/nodes_top_of_column.php
index f3f955b18..cc42eeafd 100644
--- a/zenario/modules/zenario_menu_multicolumn/db_updates/nodes_top_of_column.php
+++ b/zenario/modules/zenario_menu_multicolumn/db_updates/nodes_top_of_column.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_menu_multicolumn/module_code.php b/zenario/modules/zenario_menu_multicolumn/module_code.php
index 48bbbd4ee..0b53090c3 100644
--- a/zenario/modules/zenario_menu_multicolumn/module_code.php
+++ b/zenario/modules/zenario_menu_multicolumn/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_menu_responsive_multilevel_2/module_code.php b/zenario/modules/zenario_menu_responsive_multilevel_2/module_code.php
index 9cd96a818..46f64e87f 100644
--- a/zenario/modules/zenario_menu_responsive_multilevel_2/module_code.php
+++ b/zenario/modules/zenario_menu_responsive_multilevel_2/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_menu_vertical/module_code.php b/zenario/modules/zenario_menu_vertical/module_code.php
index 06e650e49..95603b19a 100644
--- a/zenario/modules/zenario_menu_vertical/module_code.php
+++ b/zenario/modules/zenario_menu_vertical/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_meta_data/module_code.php b/zenario/modules/zenario_meta_data/module_code.php
index 00f0794fb..18e58ffdd 100644
--- a/zenario/modules/zenario_meta_data/module_code.php
+++ b/zenario/modules/zenario_meta_data/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_multiple_image_container/module_code.php b/zenario/modules/zenario_multiple_image_container/module_code.php
index 4be5465bd..74fb76228 100644
--- a/zenario/modules/zenario_multiple_image_container/module_code.php
+++ b/zenario/modules/zenario_multiple_image_container/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -278,12 +278,20 @@ public function validateAdminBox($path, $settingGroup, &$box, &$fields, &$values
 				switch ($values['links/link_type_'. $imageId]) {
 					case '_CONTENT_ITEM':
 						if (!$values['links/hyperlink_target_'. $imageId]) {
+							$fields['links/hyperlink_target_'. $imageId]['error'] = true;
 							$box['tabs']['links']['errors']['no_content_item'] = ze\admin::phrase('Please select a content item');
 						}
+						if ($values['links/link_to_anchor_'. $imageId]) {
+							if (!$values['links/hyperlink_anchor_'. $imageId]) {
+								$fields['links/hyperlink_anchor_'. $imageId]['error'] = true;
+								$box['tabs']['links']['errors']['no_anchor_name'] = ze\admin::phrase('Please enter an anchor name');
+							}
+						}
 						break;
 					
 					case '_EXTERNAL_URL':
 						if (!$values['links/url_'. $imageId]) {
+							$fields['links/url_'. $imageId]['error'] = true;
 							$box['tabs']['links']['errors']['no_url'] = ze\admin::phrase('Please enter a URL');
 						}
 						break;
diff --git a/zenario/modules/zenario_multiple_image_container/tuix/admin_boxes/plugin_settings.yaml b/zenario/modules/zenario_multiple_image_container/tuix/admin_boxes/plugin_settings.yaml
index c54f3d390..59fc38b16 100644
--- a/zenario/modules/zenario_multiple_image_container/tuix/admin_boxes/plugin_settings.yaml
+++ b/zenario/modules/zenario_multiple_image_container/tuix/admin_boxes/plugin_settings.yaml
@@ -186,8 +186,6 @@ plugin_settings:
                   
                 hyperlink_anchor_znz:
                     indent: 2
-                    validation:
-                        required_if_not_hidden: Please enter an anchor name.
                     grouping: 'image_link image_link_znz'
                     plugin_setting:
                         name: hyperlink_anchor_znz
@@ -196,8 +194,6 @@ plugin_settings:
                     maxlength: 255
                     visible_if: |
                         zenarioAB.value('link_type_znz') == '_CONTENT_ITEM' && zenarioAB.value('link_to_anchor_znz')
-                    validation:
-                        required_if_not_hidden: Please enter an anchor name.
                     side_note: >
                         If you have an anchor on the page, you can specify it here and you'll be
                         taken to its location on navigation.
diff --git a/zenario/modules/zenario_news_ticker/js/plugin.js b/zenario/modules/zenario_news_ticker/js/plugin.js
index ddc92be28..f36961196 100644
--- a/zenario/modules/zenario_news_ticker/js/plugin.js
+++ b/zenario/modules/zenario_news_ticker/js/plugin.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_news_ticker/module_code.php b/zenario/modules/zenario_news_ticker/module_code.php
index 92c7b515f..314a98729 100644
--- a/zenario/modules/zenario_news_ticker/module_code.php
+++ b/zenario/modules/zenario_news_ticker/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_newsletter/classes/admin_boxes/admin.php b/zenario/modules/zenario_newsletter/classes/admin_boxes/admin.php
index 2075aa867..d9a2d1b23 100644
--- a/zenario/modules/zenario_newsletter/classes/admin_boxes/admin.php
+++ b/zenario/modules/zenario_newsletter/classes/admin_boxes/admin.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_newsletter/classes/admin_boxes/live_send.php b/zenario/modules/zenario_newsletter/classes/admin_boxes/live_send.php
index 7c77684d4..a6c90fd61 100644
--- a/zenario/modules/zenario_newsletter/classes/admin_boxes/live_send.php
+++ b/zenario/modules/zenario_newsletter/classes/admin_boxes/live_send.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_newsletter/classes/admin_boxes/newsletter.php b/zenario/modules/zenario_newsletter/classes/admin_boxes/newsletter.php
index d91831da6..7e1900ca1 100644
--- a/zenario/modules/zenario_newsletter/classes/admin_boxes/newsletter.php
+++ b/zenario/modules/zenario_newsletter/classes/admin_boxes/newsletter.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_newsletter/classes/admin_boxes/newsletter_template.php b/zenario/modules/zenario_newsletter/classes/admin_boxes/newsletter_template.php
index 4efc1d952..79610f476 100644
--- a/zenario/modules/zenario_newsletter/classes/admin_boxes/newsletter_template.php
+++ b/zenario/modules/zenario_newsletter/classes/admin_boxes/newsletter_template.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_newsletter/classes/admin_boxes/site_settings.php b/zenario/modules/zenario_newsletter/classes/admin_boxes/site_settings.php
index 86e2194a3..72c6187ed 100644
--- a/zenario/modules/zenario_newsletter/classes/admin_boxes/site_settings.php
+++ b/zenario/modules/zenario_newsletter/classes/admin_boxes/site_settings.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_newsletter/classes/organizer/image_library.php b/zenario/modules/zenario_newsletter/classes/organizer/image_library.php
index 8cc837dfe..ee01fe055 100644
--- a/zenario/modules/zenario_newsletter/classes/organizer/image_library.php
+++ b/zenario/modules/zenario_newsletter/classes/organizer/image_library.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_newsletter/classes/organizer/newsletter_click_throughs.php b/zenario/modules/zenario_newsletter/classes/organizer/newsletter_click_throughs.php
index 1adcfaa10..e51a3ceb5 100644
--- a/zenario/modules/zenario_newsletter/classes/organizer/newsletter_click_throughs.php
+++ b/zenario/modules/zenario_newsletter/classes/organizer/newsletter_click_throughs.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_newsletter/classes/organizer/newsletter_log.php b/zenario/modules/zenario_newsletter/classes/organizer/newsletter_log.php
index 47506097e..69630e09f 100644
--- a/zenario/modules/zenario_newsletter/classes/organizer/newsletter_log.php
+++ b/zenario/modules/zenario_newsletter/classes/organizer/newsletter_log.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_newsletter/classes/organizer/newsletter_templates.php b/zenario/modules/zenario_newsletter/classes/organizer/newsletter_templates.php
index 372289471..4deb7fd36 100644
--- a/zenario/modules/zenario_newsletter/classes/organizer/newsletter_templates.php
+++ b/zenario/modules/zenario_newsletter/classes/organizer/newsletter_templates.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_newsletter/classes/organizer/newsletters.php b/zenario/modules/zenario_newsletter/classes/organizer/newsletters.php
index 2f840904f..2d1449ac9 100644
--- a/zenario/modules/zenario_newsletter/classes/organizer/newsletters.php
+++ b/zenario/modules/zenario_newsletter/classes/organizer/newsletters.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_newsletter/classes/organizer/users.php b/zenario/modules/zenario_newsletter/classes/organizer/users.php
index 6a5112af9..9be1bd528 100644
--- a/zenario/modules/zenario_newsletter/classes/organizer/users.php
+++ b/zenario/modules/zenario_newsletter/classes/organizer/users.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_newsletter/db_updates/newsletter_site_settings.inc.php b/zenario/modules/zenario_newsletter/db_updates/newsletter_site_settings.inc.php
index 13f530e73..2fcc53669 100644
--- a/zenario/modules/zenario_newsletter/db_updates/newsletter_site_settings.inc.php
+++ b/zenario/modules/zenario_newsletter/db_updates/newsletter_site_settings.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_newsletter/db_updates/newsletter_tables.inc.php b/zenario/modules/zenario_newsletter/db_updates/newsletter_tables.inc.php
index 07eea2977..2330d4b48 100644
--- a/zenario/modules/zenario_newsletter/db_updates/newsletter_tables.inc.php
+++ b/zenario/modules/zenario_newsletter/db_updates/newsletter_tables.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_newsletter/db_updates/newsletter_user_defaults.inc.php b/zenario/modules/zenario_newsletter/db_updates/newsletter_user_defaults.inc.php
index 8f20dba12..442f4c647 100644
--- a/zenario/modules/zenario_newsletter/db_updates/newsletter_user_defaults.inc.php
+++ b/zenario/modules/zenario_newsletter/db_updates/newsletter_user_defaults.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_newsletter/module_code.php b/zenario/modules/zenario_newsletter/module_code.php
index 5abdeb41f..c300003ef 100644
--- a/zenario/modules/zenario_newsletter/module_code.php
+++ b/zenario/modules/zenario_newsletter/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_newsletter/tracker/delete_account.php b/zenario/modules/zenario_newsletter/tracker/delete_account.php
index fceafd5b2..28a20dc0f 100644
--- a/zenario/modules/zenario_newsletter/tracker/delete_account.php
+++ b/zenario/modules/zenario_newsletter/tracker/delete_account.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_newsletter/tracker/link_tracker.php b/zenario/modules/zenario_newsletter/tracker/link_tracker.php
index 527627f3c..45c8b9008 100644
--- a/zenario/modules/zenario_newsletter/tracker/link_tracker.php
+++ b/zenario/modules/zenario_newsletter/tracker/link_tracker.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_newsletter/tracker/remove_from_groups.php b/zenario/modules/zenario_newsletter/tracker/remove_from_groups.php
index 088a73635..2e13bf377 100644
--- a/zenario/modules/zenario_newsletter/tracker/remove_from_groups.php
+++ b/zenario/modules/zenario_newsletter/tracker/remove_from_groups.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_newsletter/tracker/tracker.php b/zenario/modules/zenario_newsletter/tracker/tracker.php
index 865c8ab65..8a6e63141 100644
--- a/zenario/modules/zenario_newsletter/tracker/tracker.php
+++ b/zenario/modules/zenario_newsletter/tracker/tracker.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_plugin_nest/classes/organizer/conductor.php b/zenario/modules/zenario_plugin_nest/classes/organizer/conductor.php
index 12efb45bf..fb15580e8 100644
--- a/zenario/modules/zenario_plugin_nest/classes/organizer/conductor.php
+++ b/zenario/modules/zenario_plugin_nest/classes/organizer/conductor.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -136,7 +136,7 @@ protected static function addPath($instanceId, $from, $to) {
 	
 	protected static function redirectPath(
 		$instanceId, $fromState,
-		$oldToState, $oldEquivId = 0, $oldContentType = '',
+		$oldToState, $oldEquivId, $oldContentType,
 		$newToState, $newEquivId = 0, $newContentType = ''
 	) {
 		ze\row::update('nested_paths',
diff --git a/zenario/modules/zenario_plugin_nest/classes/organizer/nested_plugins.php b/zenario/modules/zenario_plugin_nest/classes/organizer/nested_plugins.php
index 5b773184d..d6fc0fdac 100644
--- a/zenario/modules/zenario_plugin_nest/classes/organizer/nested_plugins.php
+++ b/zenario/modules/zenario_plugin_nest/classes/organizer/nested_plugins.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_plugin_nest/classes/organizer/plugins.php b/zenario/modules/zenario_plugin_nest/classes/organizer/plugins.php
index 8510228f0..d34a1cb82 100644
--- a/zenario/modules/zenario_plugin_nest/classes/organizer/plugins.php
+++ b/zenario/modules/zenario_plugin_nest/classes/organizer/plugins.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_plugin_nest/classes/visitor/slide_info.php b/zenario/modules/zenario_plugin_nest/classes/visitor/slide_info.php
index bcbb290bc..8c2b3007d 100644
--- a/zenario/modules/zenario_plugin_nest/classes/visitor/slide_info.php
+++ b/zenario/modules/zenario_plugin_nest/classes/visitor/slide_info.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_plugin_nest/fun/addBanner.php b/zenario/modules/zenario_plugin_nest/fun/addBanner.php
index 652d9d751..9e8983584 100644
--- a/zenario/modules/zenario_plugin_nest/fun/addBanner.php
+++ b/zenario/modules/zenario_plugin_nest/fun/addBanner.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_plugin_nest/fun/addPlugin.php b/zenario/modules/zenario_plugin_nest/fun/addPlugin.php
index 332729bf9..482f727dc 100644
--- a/zenario/modules/zenario_plugin_nest/fun/addPlugin.php
+++ b/zenario/modules/zenario_plugin_nest/fun/addPlugin.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_plugin_nest/fun/addPluginConfirm.php b/zenario/modules/zenario_plugin_nest/fun/addPluginConfirm.php
index eca4978d6..fd0dac7be 100644
--- a/zenario/modules/zenario_plugin_nest/fun/addPluginConfirm.php
+++ b/zenario/modules/zenario_plugin_nest/fun/addPluginConfirm.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_plugin_nest/fun/addPluginInstance.php b/zenario/modules/zenario_plugin_nest/fun/addPluginInstance.php
index 3e3210f6d..d16368e4b 100644
--- a/zenario/modules/zenario_plugin_nest/fun/addPluginInstance.php
+++ b/zenario/modules/zenario_plugin_nest/fun/addPluginInstance.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_plugin_nest/fun/addTwigSnippet.php b/zenario/modules/zenario_plugin_nest/fun/addTwigSnippet.php
index 964bbba38..11c767098 100644
--- a/zenario/modules/zenario_plugin_nest/fun/addTwigSnippet.php
+++ b/zenario/modules/zenario_plugin_nest/fun/addTwigSnippet.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_plugin_nest/fun/duplicatePlugin.php b/zenario/modules/zenario_plugin_nest/fun/duplicatePlugin.php
index 4b20e9ee5..d02854c8b 100644
--- a/zenario/modules/zenario_plugin_nest/fun/duplicatePlugin.php
+++ b/zenario/modules/zenario_plugin_nest/fun/duplicatePlugin.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_plugin_nest/fun/duplicatePluginConfirm.php b/zenario/modules/zenario_plugin_nest/fun/duplicatePluginConfirm.php
index 93ad3c5fb..9c8020e2a 100644
--- a/zenario/modules/zenario_plugin_nest/fun/duplicatePluginConfirm.php
+++ b/zenario/modules/zenario_plugin_nest/fun/duplicatePluginConfirm.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_plugin_nest/fun/fillAdminSlotControls.php b/zenario/modules/zenario_plugin_nest/fun/fillAdminSlotControls.php
index 63955d412..d6beb1da8 100644
--- a/zenario/modules/zenario_plugin_nest/fun/fillAdminSlotControls.php
+++ b/zenario/modules/zenario_plugin_nest/fun/fillAdminSlotControls.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_plugin_nest/fun/getBackLinks.php b/zenario/modules/zenario_plugin_nest/fun/getBackLinks.php
index ca411a20e..f436c8251 100644
--- a/zenario/modules/zenario_plugin_nest/fun/getBackLinks.php
+++ b/zenario/modules/zenario_plugin_nest/fun/getBackLinks.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_plugin_nest/fun/removePlugin.php b/zenario/modules/zenario_plugin_nest/fun/removePlugin.php
index fda78f2ff..e2ffd461a 100644
--- a/zenario/modules/zenario_plugin_nest/fun/removePlugin.php
+++ b/zenario/modules/zenario_plugin_nest/fun/removePlugin.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_plugin_nest/fun/removePluginConfirm.php b/zenario/modules/zenario_plugin_nest/fun/removePluginConfirm.php
index f1a0d0a1f..d9c1595b9 100644
--- a/zenario/modules/zenario_plugin_nest/fun/removePluginConfirm.php
+++ b/zenario/modules/zenario_plugin_nest/fun/removePluginConfirm.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_plugin_nest/fun/removeSlide.php b/zenario/modules/zenario_plugin_nest/fun/removeSlide.php
index f91c21433..b0ac92b68 100644
--- a/zenario/modules/zenario_plugin_nest/fun/removeSlide.php
+++ b/zenario/modules/zenario_plugin_nest/fun/removeSlide.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_plugin_nest/fun/removeSlideConfirm.php b/zenario/modules/zenario_plugin_nest/fun/removeSlideConfirm.php
index 7c799f3ff..e96390783 100644
--- a/zenario/modules/zenario_plugin_nest/fun/removeSlideConfirm.php
+++ b/zenario/modules/zenario_plugin_nest/fun/removeSlideConfirm.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_plugin_nest/fun/reorderNest.php b/zenario/modules/zenario_plugin_nest/fun/reorderNest.php
index cf5957739..7bbed0017 100644
--- a/zenario/modules/zenario_plugin_nest/fun/reorderNest.php
+++ b/zenario/modules/zenario_plugin_nest/fun/reorderNest.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_plugin_nest/fun/resyncNest.php b/zenario/modules/zenario_plugin_nest/fun/resyncNest.php
index c428dfb1c..fbf36cbee 100644
--- a/zenario/modules/zenario_plugin_nest/fun/resyncNest.php
+++ b/zenario/modules/zenario_plugin_nest/fun/resyncNest.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_plugin_nest/js/plugin.js b/zenario/modules/zenario_plugin_nest/js/plugin.js
index 7d962c0a2..e2871ee30 100644
--- a/zenario/modules/zenario_plugin_nest/js/plugin.js
+++ b/zenario/modules/zenario_plugin_nest/js/plugin.js
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_plugin_nest/module_code.php b/zenario/modules/zenario_plugin_nest/module_code.php
index ce563a762..635b93486 100644
--- a/zenario/modules/zenario_plugin_nest/module_code.php
+++ b/zenario/modules/zenario_plugin_nest/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_print_page/module_code.php b/zenario/modules/zenario_print_page/module_code.php
index 57fc27112..e6f522a0d 100644
--- a/zenario/modules/zenario_print_page/module_code.php
+++ b/zenario/modules/zenario_print_page/module_code.php
@@ -1,7 +1,7 @@
 <?php
 if (!defined('NOT_ACCESSED_DIRECTLY')) exit('This file may not be directly accessed'); 
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_pro_features/classes/admin_boxes/alias.php b/zenario/modules/zenario_pro_features/classes/admin_boxes/alias.php
index 8ef82a8f4..d83cd2410 100644
--- a/zenario/modules/zenario_pro_features/classes/admin_boxes/alias.php
+++ b/zenario/modules/zenario_pro_features/classes/admin_boxes/alias.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_pro_features/classes/admin_boxes/content.php b/zenario/modules/zenario_pro_features/classes/admin_boxes/content.php
index 9b245971f..831d16e7c 100644
--- a/zenario/modules/zenario_pro_features/classes/admin_boxes/content.php
+++ b/zenario/modules/zenario_pro_features/classes/admin_boxes/content.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_pro_features/classes/admin_boxes/menu.php b/zenario/modules/zenario_pro_features/classes/admin_boxes/menu.php
index 005b67101..e8bb364ee 100644
--- a/zenario/modules/zenario_pro_features/classes/admin_boxes/menu.php
+++ b/zenario/modules/zenario_pro_features/classes/admin_boxes/menu.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_pro_features/classes/admin_boxes/menu_section.php b/zenario/modules/zenario_pro_features/classes/admin_boxes/menu_section.php
index 8cc57f45f..f2535ea3d 100644
--- a/zenario/modules/zenario_pro_features/classes/admin_boxes/menu_section.php
+++ b/zenario/modules/zenario_pro_features/classes/admin_boxes/menu_section.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_pro_features/classes/admin_boxes/menu_text.php b/zenario/modules/zenario_pro_features/classes/admin_boxes/menu_text.php
index c336ee2f1..f2f91acb9 100644
--- a/zenario/modules/zenario_pro_features/classes/admin_boxes/menu_text.php
+++ b/zenario/modules/zenario_pro_features/classes/admin_boxes/menu_text.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_pro_features/classes/admin_boxes/pro_features_spare_alias.php b/zenario/modules/zenario_pro_features/classes/admin_boxes/pro_features_spare_alias.php
index e103818d3..3852dd4f2 100644
--- a/zenario/modules/zenario_pro_features/classes/admin_boxes/pro_features_spare_alias.php
+++ b/zenario/modules/zenario_pro_features/classes/admin_boxes/pro_features_spare_alias.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_pro_features/classes/admin_boxes/site_settings.php b/zenario/modules/zenario_pro_features/classes/admin_boxes/site_settings.php
index b7eaa4029..0b758cb16 100644
--- a/zenario/modules/zenario_pro_features/classes/admin_boxes/site_settings.php
+++ b/zenario/modules/zenario_pro_features/classes/admin_boxes/site_settings.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_pro_features/classes/organizer/chained.php b/zenario/modules/zenario_pro_features/classes/organizer/chained.php
index e32484cb1..29744a3db 100644
--- a/zenario/modules/zenario_pro_features/classes/organizer/chained.php
+++ b/zenario/modules/zenario_pro_features/classes/organizer/chained.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_pro_features/classes/organizer/content.php b/zenario/modules/zenario_pro_features/classes/organizer/content.php
index b5d4fae6c..202fd8ee7 100644
--- a/zenario/modules/zenario_pro_features/classes/organizer/content.php
+++ b/zenario/modules/zenario_pro_features/classes/organizer/content.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_pro_features/classes/organizer/error_log.php b/zenario/modules/zenario_pro_features/classes/organizer/error_log.php
index 30471b831..ae5b55f83 100644
--- a/zenario/modules/zenario_pro_features/classes/organizer/error_log.php
+++ b/zenario/modules/zenario_pro_features/classes/organizer/error_log.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_pro_features/classes/organizer/languages.php b/zenario/modules/zenario_pro_features/classes/organizer/languages.php
index 9dfa1984c..86a0397ff 100644
--- a/zenario/modules/zenario_pro_features/classes/organizer/languages.php
+++ b/zenario/modules/zenario_pro_features/classes/organizer/languages.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_pro_features/classes/organizer/menu_nodes.php b/zenario/modules/zenario_pro_features/classes/organizer/menu_nodes.php
index b29728f81..1dd4c0d80 100644
--- a/zenario/modules/zenario_pro_features/classes/organizer/menu_nodes.php
+++ b/zenario/modules/zenario_pro_features/classes/organizer/menu_nodes.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_pro_features/classes/organizer/sections.php b/zenario/modules/zenario_pro_features/classes/organizer/sections.php
index 985ef0484..ed31261b3 100644
--- a/zenario/modules/zenario_pro_features/classes/organizer/sections.php
+++ b/zenario/modules/zenario_pro_features/classes/organizer/sections.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_pro_features/classes/organizer/settings_pro_features__spare_aliases.php b/zenario/modules/zenario_pro_features/classes/organizer/settings_pro_features__spare_aliases.php
index e0e04eb0a..ac306d178 100644
--- a/zenario/modules/zenario_pro_features/classes/organizer/settings_pro_features__spare_aliases.php
+++ b/zenario/modules/zenario_pro_features/classes/organizer/settings_pro_features__spare_aliases.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_pro_features/edition_includes/checkRequestVars.php b/zenario/modules/zenario_pro_features/edition_includes/checkRequestVars.php
index e36b3e98c..831e69f03 100644
--- a/zenario/modules/zenario_pro_features/edition_includes/checkRequestVars.php
+++ b/zenario/modules/zenario_pro_features/edition_includes/checkRequestVars.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_pro_features/edition_includes/index.pre_get_contents.php b/zenario/modules/zenario_pro_features/edition_includes/index.pre_get_contents.php
index 8a4219a56..73f96f5d1 100644
--- a/zenario/modules/zenario_pro_features/edition_includes/index.pre_get_contents.php
+++ b/zenario/modules/zenario_pro_features/edition_includes/index.pre_get_contents.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_pro_features/edition_includes/index.pre_header.php b/zenario/modules/zenario_pro_features/edition_includes/index.pre_header.php
index 06941479d..05b4312bc 100644
--- a/zenario/modules/zenario_pro_features/edition_includes/index.pre_header.php
+++ b/zenario/modules/zenario_pro_features/edition_includes/index.pre_header.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_pro_features/edition_includes/publishContent.php b/zenario/modules/zenario_pro_features/edition_includes/publishContent.php
index c758f86c3..1ed4fff50 100644
--- a/zenario/modules/zenario_pro_features/edition_includes/publishContent.php
+++ b/zenario/modules/zenario_pro_features/edition_includes/publishContent.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_pro_features/fun/createExportFile.php b/zenario/modules/zenario_pro_features/fun/createExportFile.php
index 4475116de..533418ab3 100644
--- a/zenario/modules/zenario_pro_features/fun/createExportFile.php
+++ b/zenario/modules/zenario_pro_features/fun/createExportFile.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_pro_features/fun/importContentItem.php b/zenario/modules/zenario_pro_features/fun/importContentItem.php
index 2761b7ee0..a39d5d531 100644
--- a/zenario/modules/zenario_pro_features/fun/importContentItem.php
+++ b/zenario/modules/zenario_pro_features/fun/importContentItem.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_pro_features/js/cache_info.js b/zenario/modules/zenario_pro_features/js/cache_info.js
index 515df06cc..002ef0e88 100644
--- a/zenario/modules/zenario_pro_features/js/cache_info.js
+++ b/zenario/modules/zenario_pro_features/js/cache_info.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@ zenarioCI.box = function(slotName, type, cantCache, settingEnabled) {
 		cache_if = {u: 'User', g: 'GET', p: 'POST', s: 'SESSION', c: 'COOKIE'},
 		clear_cache_by = {};
 	
-	for (slotNameNestId in zenarioCD.slots) {
+	for (var slotNameNestId in zenarioCD.slots) {
 		if (!slotName
 		 || slotNameNestId == slotName
 		 || slotNameNestId.substr(0, slotName.length + 1) == slotName + '-'
@@ -67,7 +67,7 @@ zenarioCI.box = function(slotName, type, cantCache, settingEnabled) {
 	
 	if (cantCache) {
 		css = 'zenario_cache_disabled';
-		html += '<h1 class="' + css + '">This ' + type + ' cannot be cached.</h1><h2>Caching is disabled for this ' + type + '.</h2>';
+		html += '<h1 class="' + css + '">This ' + type + ' does not support caching.</h1><h2>The developer did not enable support for caching for this ' + type + '.</h2>';
 	
 	} else {
 		
@@ -132,7 +132,7 @@ zenarioCI.box = function(slotName, type, cantCache, settingEnabled) {
 			html = '<h1 class="' + css + '">This ' + type + ' can be cached and was just written to the cache.</h1>' + html;
 		
 		} else {
-			html = '<h1 class="' + css + '">This ' + type + ' could be cached if Plugin Caching was enabled in the Site Settings.</h1>' + html;
+			html = '<h1 class="' + css + '">This ' + type + ' could be cached if plugin caching was enabled in Configuration->Site Settings, Optimisation interface.</h1>' + html;
 		}
 	}
 	
diff --git a/zenario/modules/zenario_pro_features/js/cache_info.min.js b/zenario/modules/zenario_pro_features/js/cache_info.min.js
index a91548c48..977369227 100644
--- a/zenario/modules/zenario_pro_features/js/cache_info.min.js
+++ b/zenario/modules/zenario_pro_features/js/cache_info.min.js
@@ -1,8 +1,8 @@
 window.zenarioCI=function(){};
-(function(f,g,n){g.box=function(d,b,k,g){var e="",a="",h={u:"User",g:"GET",p:"POST",s:"SESSION",c:"COOKIE"},m={};for(slotNameNestId in zenarioCD.slots)if(!d||slotNameNestId==d||slotNameNestId.substr(0,d.length+1)==d+"-"||slotNameNestId==d.split("-")[0])if(k||!zenarioCD.slots[slotNameNestId].cache_if||!zenarioCD.slots[slotNameNestId].cache_if.a||zenarioCD.slots[slotNameNestId].disallow_caching){k=!0;break}else{for(var c in zenarioCD.slots[slotNameNestId].cache_if)zenarioCD.slots[slotNameNestId].cache_if[c]||delete h[c];
-if(zenarioCD.slots[slotNameNestId].clear_cache_by)for(c in zenarioCD.slots[slotNameNestId].clear_cache_by)zenarioCD.slots[slotNameNestId].clear_cache_by[c]&&(m[c]=!0)}if(k)e="zenario_cache_disabled",a+='<h1 class="'+e+'">This '+b+" cannot be cached.</h1><h2>Caching is disabled for this "+b+".</h2>";else{e="zenario_cache_in_use";if(zenarioCD.served_from_cache||d&&zenarioCD.slots[d]&&zenarioCD.slots[d].served_from_cache)e="zenario_from_cache";var l=!1,l={u:"User",g:"GET",p:"POST",s:"SESSION",c:"COOKIE"};
-d={content:"Content",menu:"Menu",user:"User",file:"File",module:"Module"};k={u:"An Extranet User is logged in",g:"A non-canonical GET request",p:"A POST request",s:"A session variable",c:"A cookie from this site",l:"Location dependant logic",content:"Other Content Items, any change to Categories",menu:"Menu Nodes",user:"Users, their Characteristics, Groups and Group memberships",file:"Images, animations and documents stored in the CMS",module:"Any data added by a Module"};"Page"==b&&(l.l="LOCATION");
-a=a+("<h2>The caching rules for this "+b+" are as follows:</h2>")+("<table><tr><td></td><th>Current</th><th>"+b+" Req't</th><th>Conflicts</th></tr>");for(c in l)(l=zenarioCD.load[c]&&!h[c])&&(e="zenario_not_cached"),a+="<tr><th>"+f._h(k[c])+"</th>",a+='<td><span class="'+(zenarioCD.load[c]?"zenario_cache_one":"zenario_cache_zero")+'">&nbsp;</span></td>',a+='<td class="zenario_cache_req"><span class="zenario_cache_zero">&nbsp;</span>'+(h[c]?' or <span class="zenario_cache_one">&nbsp;</span>':"")+"</td>",
-a+="<td>"+(l?'<span class="zenario_cache_cross">&nbsp;</span>':"&nbsp;")+"</td></tr>";a+="</table>";h=!1;for(c in d)m[c]&&(h||(a+="<h2>This "+b+" will be cleared from the cache when any of the following change:</h2><ul>",h=!0),a+="<li>"+f._h(k[c])+"</li>");h&&(a+="</ul>");a="zenario_not_cached"==e?'<h1 class="'+e+'">This '+b+" can be cached, but not in the current situation due to a conflict.</h1>"+a:"zenario_from_cache"==e?'<h1 class="'+e+'">This '+b+" can be cached and was just served from the cache.</h1>"+
-a:g?'<h1 class="'+e+'">This '+b+" can be cached and was just written to the cache.</h1>"+a:'<h1 class="'+e+'">This '+b+" could be cached if Plugin Caching was enabled in the Site Settings.</h1>"+a}return'<x-zenario-cache-info class="'+e+'" title="'+f._h('<div class="zenario_cache_box">'+a+"</div>")+'"></x-zenario-cache-info>'};g.init=function(d){if(!g.inited){var b;$("div.zenario_slot").each(function(d,f){f.id&&(b=f.id.replace("plgslt_",""))&&zenarioCD.slots[b]&&$(f).prepend('<x-zenario-cache-info class="zenario_cache_info">'+
-g.box(b,"Plugin",!1,zenarioCD.cache_plugins)+"</x-zenario-cache-info>")});f._g("zenario_cache_info").innerHTML=g.box("","Page",!d,!0);f._t("x-zenario-cache-info.zenario_cache_info *",{tooltipClass:"zenario_cache_info_tooltip",position:{my:"right-2 center",at:"left center",collision:"flipfit"}});g.inited=!0}}})(zenario,zenarioCI);
+(function(g,h,n){h.box=function(e,c,l,h){var f="",a="",k={u:"User",g:"GET",p:"POST",s:"SESSION",c:"COOKIE"},m={},b;for(b in zenarioCD.slots)if(!e||b==e||b.substr(0,e.length+1)==e+"-"||b==e.split("-")[0])if(l||!zenarioCD.slots[b].cache_if||!zenarioCD.slots[b].cache_if.a||zenarioCD.slots[b].disallow_caching){l=!0;break}else{for(var d in zenarioCD.slots[b].cache_if)zenarioCD.slots[b].cache_if[d]||delete k[d];if(zenarioCD.slots[b].clear_cache_by)for(d in zenarioCD.slots[b].clear_cache_by)zenarioCD.slots[b].clear_cache_by[d]&&(m[d]=
+!0)}if(l)f="zenario_cache_disabled",a+='<h1 class="'+f+'">This '+c+" does not support caching.</h1><h2>The developer did not enable support for caching for this "+c+".</h2>";else{f="zenario_cache_in_use";if(zenarioCD.served_from_cache||e&&zenarioCD.slots[e]&&zenarioCD.slots[e].served_from_cache)f="zenario_from_cache";b=!1;b={u:"User",g:"GET",p:"POST",s:"SESSION",c:"COOKIE"};e={content:"Content",menu:"Menu",user:"User",file:"File",module:"Module"};l={u:"An Extranet User is logged in",g:"A non-canonical GET request",
+p:"A POST request",s:"A session variable",c:"A cookie from this site",l:"Location dependant logic",content:"Other Content Items, any change to Categories",menu:"Menu Nodes",user:"Users, their Characteristics, Groups and Group memberships",file:"Images, animations and documents stored in the CMS",module:"Any data added by a Module"};"Page"==c&&(b.l="LOCATION");a=a+("<h2>The caching rules for this "+c+" are as follows:</h2>")+("<table><tr><td></td><th>Current</th><th>"+c+" Req't</th><th>Conflicts</th></tr>");
+for(d in b)(b=zenarioCD.load[d]&&!k[d])&&(f="zenario_not_cached"),a+="<tr><th>"+g._h(l[d])+"</th>",a+='<td><span class="'+(zenarioCD.load[d]?"zenario_cache_one":"zenario_cache_zero")+'">&nbsp;</span></td>',a+='<td class="zenario_cache_req"><span class="zenario_cache_zero">&nbsp;</span>'+(k[d]?' or <span class="zenario_cache_one">&nbsp;</span>':"")+"</td>",a+="<td>"+(b?'<span class="zenario_cache_cross">&nbsp;</span>':"&nbsp;")+"</td></tr>";a+="</table>";k=!1;for(d in e)m[d]&&(k||(a+="<h2>This "+c+
+" will be cleared from the cache when any of the following change:</h2><ul>",k=!0),a+="<li>"+g._h(l[d])+"</li>");k&&(a+="</ul>");a="zenario_not_cached"==f?'<h1 class="'+f+'">This '+c+" can be cached, but not in the current situation due to a conflict.</h1>"+a:"zenario_from_cache"==f?'<h1 class="'+f+'">This '+c+" can be cached and was just served from the cache.</h1>"+a:h?'<h1 class="'+f+'">This '+c+" can be cached and was just written to the cache.</h1>"+a:'<h1 class="'+f+'">This '+c+" could be cached if plugin caching was enabled in Configuration->Site Settings, Optimisation interface.</h1>"+
+a}return'<x-zenario-cache-info class="'+f+'" title="'+g._h('<div class="zenario_cache_box">'+a+"</div>")+'"></x-zenario-cache-info>'};h.init=function(e){if(!h.inited){var c;$("div.zenario_slot").each(function(e,g){g.id&&(c=g.id.replace("plgslt_",""))&&zenarioCD.slots[c]&&$(g).prepend('<x-zenario-cache-info class="zenario_cache_info">'+h.box(c,"Plugin",!1,zenarioCD.cache_plugins)+"</x-zenario-cache-info>")});g._g("zenario_cache_info").innerHTML=h.box("","Page",!e,!0);g._t("x-zenario-cache-info.zenario_cache_info *",
+{tooltipClass:"zenario_cache_info_tooltip",position:{my:"right-2 center",at:"left center",collision:"flipfit"}});h.inited=!0}}})(zenario,zenarioCI);
diff --git a/zenario/modules/zenario_pro_features/js/organizer.js b/zenario/modules/zenario_pro_features/js/organizer.js
index 4b692325c..88a1a2482 100644
--- a/zenario/modules/zenario_pro_features/js/organizer.js
+++ b/zenario/modules/zenario_pro_features/js/organizer.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_pro_features/module_code.php b/zenario/modules/zenario_pro_features/module_code.php
index 04a889645..59af52d1c 100644
--- a/zenario/modules/zenario_pro_features/module_code.php
+++ b/zenario/modules/zenario_pro_features/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_project_locations/db_updates/projects.inc.php b/zenario/modules/zenario_project_locations/db_updates/projects.inc.php
index 9746f9c78..40c12e23f 100644
--- a/zenario/modules/zenario_project_locations/db_updates/projects.inc.php
+++ b/zenario/modules/zenario_project_locations/db_updates/projects.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_project_locations/module_code.php b/zenario/modules/zenario_project_locations/module_code.php
index 30b876aa5..a6cadd23e 100644
--- a/zenario/modules/zenario_project_locations/module_code.php
+++ b/zenario/modules/zenario_project_locations/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_project_sector_service_gallery/module_code.php b/zenario/modules/zenario_project_sector_service_gallery/module_code.php
index 2eab4498b..708cee38c 100644
--- a/zenario/modules/zenario_project_sector_service_gallery/module_code.php
+++ b/zenario/modules/zenario_project_sector_service_gallery/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_promo_menu/db_updates/promo_menu.inc.php b/zenario/modules/zenario_promo_menu/db_updates/promo_menu.inc.php
index f9569252d..b6ed3c8a6 100644
--- a/zenario/modules/zenario_promo_menu/db_updates/promo_menu.inc.php
+++ b/zenario/modules/zenario_promo_menu/db_updates/promo_menu.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_promo_menu/module_code.php b/zenario/modules/zenario_promo_menu/module_code.php
index 2042108cf..9609a9f1c 100644
--- a/zenario/modules/zenario_promo_menu/module_code.php
+++ b/zenario/modules/zenario_promo_menu/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_recently_viewed/module_code.php b/zenario/modules/zenario_recently_viewed/module_code.php
index 4100fcdb3..e78e655d7 100644
--- a/zenario/modules/zenario_recently_viewed/module_code.php
+++ b/zenario/modules/zenario_recently_viewed/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_recurring_countdown/module_code.php b/zenario/modules/zenario_recurring_countdown/module_code.php
index a2d4181c5..2e34f6a35 100644
--- a/zenario/modules/zenario_recurring_countdown/module_code.php
+++ b/zenario/modules/zenario_recurring_countdown/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_scheduled_task_manager/cron/run_every_minute.php b/zenario/modules/zenario_scheduled_task_manager/cron/run_every_minute.php
index d656d4325..fd3801e90 100644
--- a/zenario/modules/zenario_scheduled_task_manager/cron/run_every_minute.php
+++ b/zenario/modules/zenario_scheduled_task_manager/cron/run_every_minute.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_scheduled_task_manager/fun/fillAdminBox.php b/zenario/modules/zenario_scheduled_task_manager/fun/fillAdminBox.php
index 4cfdb5cc9..3a9bd683a 100644
--- a/zenario/modules/zenario_scheduled_task_manager/fun/fillAdminBox.php
+++ b/zenario/modules/zenario_scheduled_task_manager/fun/fillAdminBox.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_scheduled_task_manager/fun/fillOrganizerPanel.php b/zenario/modules/zenario_scheduled_task_manager/fun/fillOrganizerPanel.php
index dcc6f72fe..cba934a0c 100644
--- a/zenario/modules/zenario_scheduled_task_manager/fun/fillOrganizerPanel.php
+++ b/zenario/modules/zenario_scheduled_task_manager/fun/fillOrganizerPanel.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_scheduled_task_manager/fun/formatAdminBox.php b/zenario/modules/zenario_scheduled_task_manager/fun/formatAdminBox.php
index b2e400d36..d8ab7d9bd 100644
--- a/zenario/modules/zenario_scheduled_task_manager/fun/formatAdminBox.php
+++ b/zenario/modules/zenario_scheduled_task_manager/fun/formatAdminBox.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_scheduled_task_manager/fun/handleOrganizerPanelAJAX.php b/zenario/modules/zenario_scheduled_task_manager/fun/handleOrganizerPanelAJAX.php
index 4e83d8d42..2cb14932d 100644
--- a/zenario/modules/zenario_scheduled_task_manager/fun/handleOrganizerPanelAJAX.php
+++ b/zenario/modules/zenario_scheduled_task_manager/fun/handleOrganizerPanelAJAX.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_scheduled_task_manager/fun/preFillOrganizerPanel.php b/zenario/modules/zenario_scheduled_task_manager/fun/preFillOrganizerPanel.php
index 102c788c6..f5cf4c2f8 100644
--- a/zenario/modules/zenario_scheduled_task_manager/fun/preFillOrganizerPanel.php
+++ b/zenario/modules/zenario_scheduled_task_manager/fun/preFillOrganizerPanel.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_scheduled_task_manager/fun/saveAdminBox.php b/zenario/modules/zenario_scheduled_task_manager/fun/saveAdminBox.php
index 237631684..81208fe80 100644
--- a/zenario/modules/zenario_scheduled_task_manager/fun/saveAdminBox.php
+++ b/zenario/modules/zenario_scheduled_task_manager/fun/saveAdminBox.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_scheduled_task_manager/fun/validateAdminBox.php b/zenario/modules/zenario_scheduled_task_manager/fun/validateAdminBox.php
index b2e400d36..d8ab7d9bd 100644
--- a/zenario/modules/zenario_scheduled_task_manager/fun/validateAdminBox.php
+++ b/zenario/modules/zenario_scheduled_task_manager/fun/validateAdminBox.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_scheduled_task_manager/installation_check.php b/zenario/modules/zenario_scheduled_task_manager/installation_check.php
index 48479e18e..ccd244154 100644
--- a/zenario/modules/zenario_scheduled_task_manager/installation_check.php
+++ b/zenario/modules/zenario_scheduled_task_manager/installation_check.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_scheduled_task_manager/module_code.php b/zenario/modules/zenario_scheduled_task_manager/module_code.php
index c328ec661..68a3ed16c 100644
--- a/zenario/modules/zenario_scheduled_task_manager/module_code.php
+++ b/zenario/modules/zenario_scheduled_task_manager/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_search_entry_box/module_code.php b/zenario/modules/zenario_search_entry_box/module_code.php
index 842e5c7d0..30cbda262 100644
--- a/zenario/modules/zenario_search_entry_box/module_code.php
+++ b/zenario/modules/zenario_search_entry_box/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_search_entry_box_predictive_probusiness/module_code.php b/zenario/modules/zenario_search_entry_box_predictive_probusiness/module_code.php
index 075cff6da..99088b353 100644
--- a/zenario/modules/zenario_search_entry_box_predictive_probusiness/module_code.php
+++ b/zenario/modules/zenario_search_entry_box_predictive_probusiness/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_search_results/module_code.php b/zenario/modules/zenario_search_results/module_code.php
index 697e90b72..6ec88b08d 100644
--- a/zenario/modules/zenario_search_results/module_code.php
+++ b/zenario/modules/zenario_search_results/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_search_results_pro/module_code.php b/zenario/modules/zenario_search_results_pro/module_code.php
index eafa43496..bfe4dd27b 100644
--- a/zenario/modules/zenario_search_results_pro/module_code.php
+++ b/zenario/modules/zenario_search_results_pro/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_sensitive_content_message/db_updates/updates.inc.php b/zenario/modules/zenario_sensitive_content_message/db_updates/updates.inc.php
index 49a3d3579..ac0ef8fe0 100644
--- a/zenario/modules/zenario_sensitive_content_message/db_updates/updates.inc.php
+++ b/zenario/modules/zenario_sensitive_content_message/db_updates/updates.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_sensitive_content_message/fun/accept_sensitive_content_message.php b/zenario/modules/zenario_sensitive_content_message/fun/accept_sensitive_content_message.php
index 135aa377e..9a827c6e5 100644
--- a/zenario/modules/zenario_sensitive_content_message/fun/accept_sensitive_content_message.php
+++ b/zenario/modules/zenario_sensitive_content_message/fun/accept_sensitive_content_message.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_sensitive_content_message/fun/sensitive_content_message.php b/zenario/modules/zenario_sensitive_content_message/fun/sensitive_content_message.php
index 87af14b33..d40adc314 100644
--- a/zenario/modules/zenario_sensitive_content_message/fun/sensitive_content_message.php
+++ b/zenario/modules/zenario_sensitive_content_message/fun/sensitive_content_message.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_sensitive_content_message/module_code.php b/zenario/modules/zenario_sensitive_content_message/module_code.php
index f8802169e..55697cf17 100644
--- a/zenario/modules/zenario_sensitive_content_message/module_code.php
+++ b/zenario/modules/zenario_sensitive_content_message/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_sitemap/module_code.php b/zenario/modules/zenario_sitemap/module_code.php
index d62ef2725..4101034ed 100644
--- a/zenario/modules/zenario_sitemap/module_code.php
+++ b/zenario/modules/zenario_sitemap/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_slideshow/js/interface.js b/zenario/modules/zenario_slideshow/js/interface.js
index 3479a9948..4e2139b0e 100644
--- a/zenario/modules/zenario_slideshow/js/interface.js
+++ b/zenario/modules/zenario_slideshow/js/interface.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_slideshow/js/jquery_cycle2_interface.js b/zenario/modules/zenario_slideshow/js/jquery_cycle2_interface.js
index 5bd60e5d1..3170dcdd1 100644
--- a/zenario/modules/zenario_slideshow/js/jquery_cycle2_interface.js
+++ b/zenario/modules/zenario_slideshow/js/jquery_cycle2_interface.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_slideshow/js/jquery_cycle_interface.js b/zenario/modules/zenario_slideshow/js/jquery_cycle_interface.js
index 360055339..fc7fb6efc 100644
--- a/zenario/modules/zenario_slideshow/js/jquery_cycle_interface.js
+++ b/zenario/modules/zenario_slideshow/js/jquery_cycle_interface.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_slideshow/js/jquery_roundabout_interface.js b/zenario/modules/zenario_slideshow/js/jquery_roundabout_interface.js
index 2c08d2e58..9322243c9 100644
--- a/zenario/modules/zenario_slideshow/js/jquery_roundabout_interface.js
+++ b/zenario/modules/zenario_slideshow/js/jquery_roundabout_interface.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_slideshow/module_code.php b/zenario/modules/zenario_slideshow/module_code.php
index 983d0e0f7..561a22292 100644
--- a/zenario/modules/zenario_slideshow/module_code.php
+++ b/zenario/modules/zenario_slideshow/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_slideshow_simple/module_code.php b/zenario/modules/zenario_slideshow_simple/module_code.php
index e2bed1b7b..142765cbc 100644
--- a/zenario/modules/zenario_slideshow_simple/module_code.php
+++ b/zenario/modules/zenario_slideshow_simple/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_timezones/js/plugin.js b/zenario/modules/zenario_timezones/js/plugin.js
index 7e9db92d8..c3232707e 100644
--- a/zenario/modules/zenario_timezones/js/plugin.js
+++ b/zenario/modules/zenario_timezones/js/plugin.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_timezones/module_code.php b/zenario/modules/zenario_timezones/module_code.php
index 5bc5f76a0..ae4c49d79 100644
--- a/zenario/modules/zenario_timezones/module_code.php
+++ b/zenario/modules/zenario_timezones/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_twig_snippet/module_code.php b/zenario/modules/zenario_twig_snippet/module_code.php
index eac283e28..58754adc4 100644
--- a/zenario/modules/zenario_twig_snippet/module_code.php
+++ b/zenario/modules/zenario_twig_snippet/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_user_consent_forms/db_updates/user_consent_forms.inc.php b/zenario/modules/zenario_user_consent_forms/db_updates/user_consent_forms.inc.php
index f65e9500a..d96f23cc2 100644
--- a/zenario/modules/zenario_user_consent_forms/db_updates/user_consent_forms.inc.php
+++ b/zenario/modules/zenario_user_consent_forms/db_updates/user_consent_forms.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_user_consent_forms/module_code.php b/zenario/modules/zenario_user_consent_forms/module_code.php
index 3b08ebf87..2de603e59 100644
--- a/zenario/modules/zenario_user_consent_forms/module_code.php
+++ b/zenario/modules/zenario_user_consent_forms/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_user_documents/db_updates/user_document_dataset.inc.php b/zenario/modules/zenario_user_documents/db_updates/user_document_dataset.inc.php
index caa21f782..5f7e9500b 100644
--- a/zenario/modules/zenario_user_documents/db_updates/user_document_dataset.inc.php
+++ b/zenario/modules/zenario_user_documents/db_updates/user_document_dataset.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_user_documents/latest_revision_no.inc.php b/zenario/modules/zenario_user_documents/latest_revision_no.inc.php
index 5ddea2a06..2c88f5eab 100644
--- a/zenario/modules/zenario_user_documents/latest_revision_no.inc.php
+++ b/zenario/modules/zenario_user_documents/latest_revision_no.inc.php
@@ -1,7 +1,7 @@
 <?php
 if (!defined('NOT_ACCESSED_DIRECTLY')) exit;
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_user_documents/module_code.php b/zenario/modules/zenario_user_documents/module_code.php
index d4e0081f2..6f0dfe5d4 100644
--- a/zenario/modules/zenario_user_documents/module_code.php
+++ b/zenario/modules/zenario_user_documents/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_user_forms/classes/admin_boxes/admin.php b/zenario/modules/zenario_user_forms/classes/admin_boxes/admin.php
index 8ec41322f..f00241fc9 100644
--- a/zenario/modules/zenario_user_forms/classes/admin_boxes/admin.php
+++ b/zenario/modules/zenario_user_forms/classes/admin_boxes/admin.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_user_forms/classes/admin_boxes/delete_form_field.php b/zenario/modules/zenario_user_forms/classes/admin_boxes/delete_form_field.php
index 2b8f1add3..bdfc77785 100644
--- a/zenario/modules/zenario_user_forms/classes/admin_boxes/delete_form_field.php
+++ b/zenario/modules/zenario_user_forms/classes/admin_boxes/delete_form_field.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_user_forms/classes/admin_boxes/email_template.php b/zenario/modules/zenario_user_forms/classes/admin_boxes/email_template.php
index 51880b6a1..884efc252 100644
--- a/zenario/modules/zenario_user_forms/classes/admin_boxes/email_template.php
+++ b/zenario/modules/zenario_user_forms/classes/admin_boxes/email_template.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_user_forms/classes/admin_boxes/export_user_responses.php b/zenario/modules/zenario_user_forms/classes/admin_boxes/export_user_responses.php
index b05db63b4..eda074f19 100644
--- a/zenario/modules/zenario_user_forms/classes/admin_boxes/export_user_responses.php
+++ b/zenario/modules/zenario_user_forms/classes/admin_boxes/export_user_responses.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_user_forms/classes/admin_boxes/field_calculation.php b/zenario/modules/zenario_user_forms/classes/admin_boxes/field_calculation.php
index e3ca555ef..c7c35086d 100644
--- a/zenario/modules/zenario_user_forms/classes/admin_boxes/field_calculation.php
+++ b/zenario/modules/zenario_user_forms/classes/admin_boxes/field_calculation.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_user_forms/classes/admin_boxes/import_user_forms.php b/zenario/modules/zenario_user_forms/classes/admin_boxes/import_user_forms.php
index 0e80a0916..96067b400 100644
--- a/zenario/modules/zenario_user_forms/classes/admin_boxes/import_user_forms.php
+++ b/zenario/modules/zenario_user_forms/classes/admin_boxes/import_user_forms.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_user_forms/classes/admin_boxes/plugin_settings.php b/zenario/modules/zenario_user_forms/classes/admin_boxes/plugin_settings.php
index 50e41580b..0d9021ee0 100644
--- a/zenario/modules/zenario_user_forms/classes/admin_boxes/plugin_settings.php
+++ b/zenario/modules/zenario_user_forms/classes/admin_boxes/plugin_settings.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_user_forms/classes/admin_boxes/predefined_text_target.php b/zenario/modules/zenario_user_forms/classes/admin_boxes/predefined_text_target.php
index f9da68deb..f91978e59 100644
--- a/zenario/modules/zenario_user_forms/classes/admin_boxes/predefined_text_target.php
+++ b/zenario/modules/zenario_user_forms/classes/admin_boxes/predefined_text_target.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_user_forms/classes/admin_boxes/predefined_text_trigger.php b/zenario/modules/zenario_user_forms/classes/admin_boxes/predefined_text_trigger.php
index d17908aa3..5d134b75d 100644
--- a/zenario/modules/zenario_user_forms/classes/admin_boxes/predefined_text_trigger.php
+++ b/zenario/modules/zenario_user_forms/classes/admin_boxes/predefined_text_trigger.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_user_forms/classes/admin_boxes/site_settings.php b/zenario/modules/zenario_user_forms/classes/admin_boxes/site_settings.php
index be7693e21..da7693659 100644
--- a/zenario/modules/zenario_user_forms/classes/admin_boxes/site_settings.php
+++ b/zenario/modules/zenario_user_forms/classes/admin_boxes/site_settings.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_user_forms/classes/admin_boxes/user_form.php b/zenario/modules/zenario_user_forms/classes/admin_boxes/user_form.php
index 241200f33..a815a35b4 100644
--- a/zenario/modules/zenario_user_forms/classes/admin_boxes/user_form.php
+++ b/zenario/modules/zenario_user_forms/classes/admin_boxes/user_form.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -384,7 +384,7 @@ public function fillAdminBox($path, $settingGroup, &$box, &$fields, &$values) {
             $consentFields = [];
             $sql = "select f.id, f.name, df.dataset_id 
                     from ".DB_PREFIX.ZENARIO_USER_FORMS_PREFIX."user_form_fields f inner join ".DB_PREFIX."custom_dataset_fields df 
-                    where df.type='consent' and f.user_form_id=".$formId." and df.id= f.user_field_id";
+                    where df.type='consent' and f.user_form_id=". (int) $formId. " and df.id= f.user_field_id";
        
             $result = ze\sql::select($sql);
             while($row = ze\sql::fetchAssoc($result)){
diff --git a/zenario/modules/zenario_user_forms/classes/admin_boxes/user_form_response.php b/zenario/modules/zenario_user_forms/classes/admin_boxes/user_form_response.php
index 342089efa..cd26bc1c7 100644
--- a/zenario/modules/zenario_user_forms/classes/admin_boxes/user_form_response.php
+++ b/zenario/modules/zenario_user_forms/classes/admin_boxes/user_form_response.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_user_forms/classes/organizer/content.php b/zenario/modules/zenario_user_forms/classes/organizer/content.php
index 6eacc1033..766d2afa5 100644
--- a/zenario/modules/zenario_user_forms/classes/organizer/content.php
+++ b/zenario/modules/zenario_user_forms/classes/organizer/content.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_user_forms/classes/organizer/form_fields_gui.php b/zenario/modules/zenario_user_forms/classes/organizer/form_fields_gui.php
index 7804a1884..90792f393 100644
--- a/zenario/modules/zenario_user_forms/classes/organizer/form_fields_gui.php
+++ b/zenario/modules/zenario_user_forms/classes/organizer/form_fields_gui.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_user_forms/classes/organizer/predefined_text_targets.php b/zenario/modules/zenario_user_forms/classes/organizer/predefined_text_targets.php
index c587d2601..8f02f65c4 100644
--- a/zenario/modules/zenario_user_forms/classes/organizer/predefined_text_targets.php
+++ b/zenario/modules/zenario_user_forms/classes/organizer/predefined_text_targets.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_user_forms/classes/organizer/predefined_text_triggers.php b/zenario/modules/zenario_user_forms/classes/organizer/predefined_text_triggers.php
index 77ebff78e..43cc82635 100644
--- a/zenario/modules/zenario_user_forms/classes/organizer/predefined_text_triggers.php
+++ b/zenario/modules/zenario_user_forms/classes/organizer/predefined_text_triggers.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_user_forms/classes/organizer/user_form_responses.php b/zenario/modules/zenario_user_forms/classes/organizer/user_form_responses.php
index bdbf18285..26918c757 100644
--- a/zenario/modules/zenario_user_forms/classes/organizer/user_form_responses.php
+++ b/zenario/modules/zenario_user_forms/classes/organizer/user_form_responses.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_user_forms/classes/organizer/user_forms.php b/zenario/modules/zenario_user_forms/classes/organizer/user_forms.php
index c0abbd126..35786f06f 100644
--- a/zenario/modules/zenario_user_forms/classes/organizer/user_forms.php
+++ b/zenario/modules/zenario_user_forms/classes/organizer/user_forms.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_user_forms/db_updates/user_forms.inc.php b/zenario/modules/zenario_user_forms/db_updates/user_forms.inc.php
index a61d59811..5c4f4a778 100644
--- a/zenario/modules/zenario_user_forms/db_updates/user_forms.inc.php
+++ b/zenario/modules/zenario_user_forms/db_updates/user_forms.inc.php
@@ -1077,7 +1077,7 @@
 				if ($pageFields) {
 					$sql = '
 						UPDATE ' . DB_PREFIX . ZENARIO_USER_FORMS_PREFIX . 'user_form_fields
-						SET page_id = ' . (int)$pageId . ' WHERE id IN (' . implode(',', array_keys($pageFields)) . ')';
+						SET page_id = ' . (int)$pageId . ' WHERE id IN (' . ze\escape::in(array_keys($pageFields), true) . ')';
 					ze\sql::update($sql);
 				}
 				$pageFields = [];
diff --git a/zenario/modules/zenario_user_forms/module_code.php b/zenario/modules/zenario_user_forms/module_code.php
index 26e25195b..062c32432 100644
--- a/zenario/modules/zenario_user_forms/module_code.php
+++ b/zenario/modules/zenario_user_forms/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -778,7 +778,7 @@ public static function deleteOldPartialResponse($formId = false, $userId = false
 		}
 	}
 	//Get visible form field data in email
-	private function sendVisibleFieldsFormEmail($startLine, $email, $mergeFields = [],$responseId, $attachments = [], 		$replyToEmail = false, $replyToName = false, $adminDownloadLinks = false) {
+	private function sendVisibleFieldsFormEmail($startLine, $email, $mergeFields, $responseId, $attachments = [], $replyToEmail = false, $replyToName = false, $adminDownloadLinks = false) {
 		$formName = $this->form['name'] ? trim($this->form['name']) : '[blank name]';
 		$formId = $this->form['id'];
 		//var_dump($this->form['id']);
diff --git a/zenario/modules/zenario_user_profile_search/module_code.php b/zenario/modules/zenario_user_profile_search/module_code.php
index 3f9c3c351..cf692b6dc 100644
--- a/zenario/modules/zenario_user_profile_search/module_code.php
+++ b/zenario/modules/zenario_user_profile_search/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_users/classes/admin_boxes/consent.php b/zenario/modules/zenario_users/classes/admin_boxes/consent.php
index 08951b85f..3772d2c32 100644
--- a/zenario/modules/zenario_users/classes/admin_boxes/consent.php
+++ b/zenario/modules/zenario_users/classes/admin_boxes/consent.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_users/classes/admin_boxes/content.php b/zenario/modules/zenario_users/classes/admin_boxes/content.php
index 2d0945443..4f303159f 100644
--- a/zenario/modules/zenario_users/classes/admin_boxes/content.php
+++ b/zenario/modules/zenario_users/classes/admin_boxes/content.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_users/classes/admin_boxes/content_privacy.php b/zenario/modules/zenario_users/classes/admin_boxes/content_privacy.php
index a35f6d20c..04b2a6b71 100644
--- a/zenario/modules/zenario_users/classes/admin_boxes/content_privacy.php
+++ b/zenario/modules/zenario_users/classes/admin_boxes/content_privacy.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_users/classes/admin_boxes/export_access_log.php b/zenario/modules/zenario_users/classes/admin_boxes/export_access_log.php
index e395766e4..9d34aaa48 100644
--- a/zenario/modules/zenario_users/classes/admin_boxes/export_access_log.php
+++ b/zenario/modules/zenario_users/classes/admin_boxes/export_access_log.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_users/classes/admin_boxes/flag.php b/zenario/modules/zenario_users/classes/admin_boxes/flag.php
index ea8df3ac0..c0e47cec8 100644
--- a/zenario/modules/zenario_users/classes/admin_boxes/flag.php
+++ b/zenario/modules/zenario_users/classes/admin_boxes/flag.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_users/classes/admin_boxes/group.php b/zenario/modules/zenario_users/classes/admin_boxes/group.php
index 5f4c91316..19b7af4c3 100644
--- a/zenario/modules/zenario_users/classes/admin_boxes/group.php
+++ b/zenario/modules/zenario_users/classes/admin_boxes/group.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_users/classes/admin_boxes/impersonate.php b/zenario/modules/zenario_users/classes/admin_boxes/impersonate.php
index e32cad1a3..692fed95a 100644
--- a/zenario/modules/zenario_users/classes/admin_boxes/impersonate.php
+++ b/zenario/modules/zenario_users/classes/admin_boxes/impersonate.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_users/classes/admin_boxes/logout.php b/zenario/modules/zenario_users/classes/admin_boxes/logout.php
index 343c50bfd..c4314d7a8 100644
--- a/zenario/modules/zenario_users/classes/admin_boxes/logout.php
+++ b/zenario/modules/zenario_users/classes/admin_boxes/logout.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_users/classes/admin_boxes/mass_group_membership.php b/zenario/modules/zenario_users/classes/admin_boxes/mass_group_membership.php
index b9fc40b4e..f440e1c61 100644
--- a/zenario/modules/zenario_users/classes/admin_boxes/mass_group_membership.php
+++ b/zenario/modules/zenario_users/classes/admin_boxes/mass_group_membership.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_users/classes/admin_boxes/site_settings.php b/zenario/modules/zenario_users/classes/admin_boxes/site_settings.php
index 4305a7f0b..9130ce783 100644
--- a/zenario/modules/zenario_users/classes/admin_boxes/site_settings.php
+++ b/zenario/modules/zenario_users/classes/admin_boxes/site_settings.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_users/classes/admin_boxes/smart_group.php b/zenario/modules/zenario_users/classes/admin_boxes/smart_group.php
index 1b2eab941..f2b707022 100644
--- a/zenario/modules/zenario_users/classes/admin_boxes/smart_group.php
+++ b/zenario/modules/zenario_users/classes/admin_boxes/smart_group.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_users/classes/admin_boxes/user__activate.php b/zenario/modules/zenario_users/classes/admin_boxes/user__activate.php
index 7a411edaa..2b7f22d51 100644
--- a/zenario/modules/zenario_users/classes/admin_boxes/user__activate.php
+++ b/zenario/modules/zenario_users/classes/admin_boxes/user__activate.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_users/classes/admin_boxes/user__convert_to_user.php b/zenario/modules/zenario_users/classes/admin_boxes/user__convert_to_user.php
index 3d14b6d98..a66ce8f32 100644
--- a/zenario/modules/zenario_users/classes/admin_boxes/user__convert_to_user.php
+++ b/zenario/modules/zenario_users/classes/admin_boxes/user__convert_to_user.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_users/classes/admin_boxes/user__delete.php b/zenario/modules/zenario_users/classes/admin_boxes/user__delete.php
index 2b9efabdf..1e3cdd071 100644
--- a/zenario/modules/zenario_users/classes/admin_boxes/user__delete.php
+++ b/zenario/modules/zenario_users/classes/admin_boxes/user__delete.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_users/classes/admin_boxes/user__details.php b/zenario/modules/zenario_users/classes/admin_boxes/user__details.php
index 12eca9179..101355381 100644
--- a/zenario/modules/zenario_users/classes/admin_boxes/user__details.php
+++ b/zenario/modules/zenario_users/classes/admin_boxes/user__details.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_users/classes/admin_boxes/user__welcome_email.php b/zenario/modules/zenario_users/classes/admin_boxes/user__welcome_email.php
index 5279fa4dd..078ce3a90 100644
--- a/zenario/modules/zenario_users/classes/admin_boxes/user__welcome_email.php
+++ b/zenario/modules/zenario_users/classes/admin_boxes/user__welcome_email.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_users/classes/organizer/access_log.php b/zenario/modules/zenario_users/classes/organizer/access_log.php
index 689e1d885..8e1340dbc 100644
--- a/zenario/modules/zenario_users/classes/organizer/access_log.php
+++ b/zenario/modules/zenario_users/classes/organizer/access_log.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -92,7 +92,7 @@ public function preFillOrganizerPanel($path, &$panel, $refinerName, $refinerId,
 				
 			}
 			$link = ze\link::absolute() .'zenario/admin/organizer.php#zenario__administration/panels/site_settings//data_protection~.site_settings~tdata_protection~k{"id"%3A"data_protection"}';
-			$accessLogDuration .= ' ' . "<a target='_blank' href='" . $link . "'>View Data Protection settings</a>";
+			$accessLogDuration .= " <a target='_blank' href='". htmlspecialchars($link). "'>". ze\admin::phrase('View Data Protection settings'). "</a>";
 			$panel['notice']['show'] = true;
 			$panel['notice']['message'] = $accessLogDuration.".";
 			$panel['notice']['html'] = true;
diff --git a/zenario/modules/zenario_users/classes/organizer/chained.php b/zenario/modules/zenario_users/classes/organizer/chained.php
index a8717cf74..67c47bd09 100644
--- a/zenario/modules/zenario_users/classes/organizer/chained.php
+++ b/zenario/modules/zenario_users/classes/organizer/chained.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_users/classes/organizer/consents.php b/zenario/modules/zenario_users/classes/organizer/consents.php
index 489be7987..93ff70fbf 100644
--- a/zenario/modules/zenario_users/classes/organizer/consents.php
+++ b/zenario/modules/zenario_users/classes/organizer/consents.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_users/classes/organizer/content.php b/zenario/modules/zenario_users/classes/organizer/content.php
index 4e7c032f9..bedb03124 100644
--- a/zenario/modules/zenario_users/classes/organizer/content.php
+++ b/zenario/modules/zenario_users/classes/organizer/content.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_users/classes/organizer/groups.php b/zenario/modules/zenario_users/classes/organizer/groups.php
index 8c616d4b5..1bd701a83 100644
--- a/zenario/modules/zenario_users/classes/organizer/groups.php
+++ b/zenario/modules/zenario_users/classes/organizer/groups.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_users/classes/organizer/smart_groups.php b/zenario/modules/zenario_users/classes/organizer/smart_groups.php
index b57fe4655..1a7152bfe 100644
--- a/zenario/modules/zenario_users/classes/organizer/smart_groups.php
+++ b/zenario/modules/zenario_users/classes/organizer/smart_groups.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_users/classes/organizer/users.php b/zenario/modules/zenario_users/classes/organizer/users.php
index 56c41911f..5325c39ad 100644
--- a/zenario/modules/zenario_users/classes/organizer/users.php
+++ b/zenario/modules/zenario_users/classes/organizer/users.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_users/db_updates/custom_dataset.inc.php b/zenario/modules/zenario_users/db_updates/custom_dataset.inc.php
index 688e59ac7..d081f99d1 100644
--- a/zenario/modules/zenario_users/db_updates/custom_dataset.inc.php
+++ b/zenario/modules/zenario_users/db_updates/custom_dataset.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_users/db_updates/updates.inc.php b/zenario/modules/zenario_users/db_updates/updates.inc.php
index 746db9ec0..c841f8477 100644
--- a/zenario/modules/zenario_users/db_updates/updates.inc.php
+++ b/zenario/modules/zenario_users/db_updates/updates.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_users/db_updates/users_email_templates.inc.php b/zenario/modules/zenario_users/db_updates/users_email_templates.inc.php
index 190ce5b06..ba584f1da 100644
--- a/zenario/modules/zenario_users/db_updates/users_email_templates.inc.php
+++ b/zenario/modules/zenario_users/db_updates/users_email_templates.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_users/fun/fillAdminToolbar.php b/zenario/modules/zenario_users/fun/fillAdminToolbar.php
index 97c1bffe2..801606f5a 100644
--- a/zenario/modules/zenario_users/fun/fillAdminToolbar.php
+++ b/zenario/modules/zenario_users/fun/fillAdminToolbar.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_users/module_code.php b/zenario/modules/zenario_users/module_code.php
index 329f5b113..0567dcb83 100644
--- a/zenario/modules/zenario_users/module_code.php
+++ b/zenario/modules/zenario_users/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_wysiwyg_editor/fun/saveContent.php b/zenario/modules/zenario_wysiwyg_editor/fun/saveContent.php
index ef0c4fc08..db1c5cd08 100644
--- a/zenario/modules/zenario_wysiwyg_editor/fun/saveContent.php
+++ b/zenario/modules/zenario_wysiwyg_editor/fun/saveContent.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_wysiwyg_editor/js/admin.js b/zenario/modules/zenario_wysiwyg_editor/js/admin.js
index 8845ad123..8656650fb 100644
--- a/zenario/modules/zenario_wysiwyg_editor/js/admin.js
+++ b/zenario/modules/zenario_wysiwyg_editor/js/admin.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/modules/zenario_wysiwyg_editor/module_code.php b/zenario/modules/zenario_wysiwyg_editor/module_code.php
index 8b7adf8a0..2f142c40b 100644
--- a/zenario/modules/zenario_wysiwyg_editor/module_code.php
+++ b/zenario/modules/zenario_wysiwyg_editor/module_code.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/redirect.php b/zenario/redirect.php
index 4affc0878..dab56b82a 100644
--- a/zenario/redirect.php
+++ b/zenario/redirect.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/reference/panel_type_base_class.js b/zenario/reference/panel_type_base_class.js
index d6f430dc8..bfd762837 100644
--- a/zenario/reference/panel_type_base_class.js
+++ b/zenario/reference/panel_type_base_class.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/reference/plugin_base_class.js b/zenario/reference/plugin_base_class.js
index a908bf03b..c8df3a543 100644
--- a/zenario/reference/plugin_base_class.js
+++ b/zenario/reference/plugin_base_class.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/s3FileUpload.php b/zenario/s3FileUpload.php
index f4f720261..61bb2d09d 100644
--- a/zenario/s3FileUpload.php
+++ b/zenario/s3FileUpload.php
@@ -1,6 +1,6 @@
 <?php 
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -75,8 +75,8 @@
 				
 				</div>';
 			echo '<script type="text/javascript" > 
-			parent.document.getElementById("s3_file_id").value = "'.$s3file['fid'].'";
-			parent.document.getElementById("s3_file_name").value = "'.$s3file['filename'].'";				
+			parent.document.getElementById("s3_file_id").value = "'. ze\escape::js($s3file['fid']). '";
+			parent.document.getElementById("s3_file_name").value = "'. ze\escape::js($s3file['filename']).'";				
 			</script>';
 		
 			echo '<div class = "remove_s3">
diff --git a/zenario/shellheader.inc.php b/zenario/shellheader.inc.php
index 9fbded648..284d066be 100644
--- a/zenario/shellheader.inc.php
+++ b/zenario/shellheader.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/sitemap.php b/zenario/sitemap.php
index c6291ca50..4df52e35d 100644
--- a/zenario/sitemap.php
+++ b/zenario/sitemap.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/styles/admin.wrapper.css.php b/zenario/styles/admin.wrapper.css.php
index 9240b9fa4..346714a82 100644
--- a/zenario/styles/admin.wrapper.css.php
+++ b/zenario/styles/admin.wrapper.css.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/styles/admin_controls.css b/zenario/styles/admin_controls.css
index d6a1af253..2c31757ba 100644
--- a/zenario/styles/admin_controls.css
+++ b/zenario/styles/admin_controls.css
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/styles/admin_floating_box.css b/zenario/styles/admin_floating_box.css
index 64a67cd29..b70ed9cf9 100644
--- a/zenario/styles/admin_floating_box.css
+++ b/zenario/styles/admin_floating_box.css
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/styles/admin_help.css b/zenario/styles/admin_help.css
index 7faae1fd1..167265f47 100644
--- a/zenario/styles/admin_help.css
+++ b/zenario/styles/admin_help.css
@@ -1,5 +1,5 @@
  /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/styles/admin_organizer.css b/zenario/styles/admin_organizer.css
index 4e0127639..a8bcc687c 100644
--- a/zenario/styles/admin_organizer.css
+++ b/zenario/styles/admin_organizer.css
@@ -1102,8 +1102,17 @@ body.ie6 .headerPanel .secondToolbar {
 	padding-right: 1px;
 }
 
+#zenario_fbAdminViewModeOptions.zenario_view_options {
+	max-height:65vh;
+	overflow-y:auto;
+}
+
+#zenario_fbAdminViewModeOptions div#organizer_colsortfields {
+	overflow:hidden;
+	max-height:none !important;
+	padding-bottom:10px;
+}
 
-#zenario_fbAdminViewModeOptions div#organizer_colsortfields,
 #zenario_fbAdminViewModeOptions div#organizer_filterfields {
 	overflow: auto;
 	overflow-x: hidden;
diff --git a/zenario/styles/admin_organizer.min.css b/zenario/styles/admin_organizer.min.css
index 64788f619..5a5ace081 100644
--- a/zenario/styles/admin_organizer.min.css
+++ b/zenario/styles/admin_organizer.min.css
@@ -92,7 +92,8 @@ body.ie6 #organizer_header #organizer_refreshRightColumn{margin-right:0}body.ie6
 #zenario_fbAdminViewModeOptions .zenario_ab_row__showcol__title_ div{background:url('../admin/images/border-horizontal-black-grey.gif') repeat-x bottom;padding:5px 10px 15px;margin-bottom:15px}
 #zenario_fbAdminViewModeOptions .zenario_ab_row__showcol__title_ div div{background:0;padding:0;margin:0}#zenario_fbAdminViewModeOptions .organizer_colPickerTitle_show,#zenario_fbAdminViewModeOptions .organizer_colPickerTitle_csv,#zenario_fbAdminViewModeOptions .organizer_colPickerTitle_sort{font-size:10px;font-weight:bold;color:#43d4f4}
 #zenario_fbAdminViewModeOptions .organizer_colPickerTitle_show,#zenario_fbAdminViewModeOptions .organizer_colPickerTitle_csv{float:left;width:35px;padding-left:5px}
-#zenario_fbAdminViewModeOptions .organizer_colPickerTitle_csv{padding-right:1px}#zenario_fbAdminViewModeOptions div#organizer_colsortfields,#zenario_fbAdminViewModeOptions div#organizer_filterfields{overflow:auto;overflow-x:hidden;overflow-y:auto}
+#zenario_fbAdminViewModeOptions .organizer_colPickerTitle_csv{padding-right:1px}#zenario_fbAdminViewModeOptions.zenario_view_options{max-height:65vh;overflow-y:auto}
+#zenario_fbAdminViewModeOptions div#organizer_colsortfields{overflow:hidden;max-height:none !important;padding-bottom:10px}#zenario_fbAdminViewModeOptions div#organizer_filterfields{overflow:auto;overflow-x:hidden;overflow-y:auto}
 #zenario_fbAdminViewModeOptions table.thickbox_table{width:100%;border-collapse:collapse}#zenario_fbAdminViewModeOptions table.thickbox_table tr td{margin:0;padding:0}
 #zenario_fbAdminViewModeOptions div#organizer_colsortfields table.thickbox_table tr td{padding:0 0 3px}#zenario_fbAdminViewModeOptions div#organizer_colsortfields .zenario_colsortfields_row{width:100%;overflow:hidden}
 #zenario_fbAdminViewModeOptions td.title{text-align:right;width:100px}#zenario_fbAdminViewModeOptions td.title label{padding-right:2px}#zenario_fbAdminColumnFilter{padding:15px 15px 10px}
diff --git a/zenario/styles/admin_toolbar.css b/zenario/styles/admin_toolbar.css
index 7b829f516..0fd9240f1 100644
--- a/zenario/styles/admin_toolbar.css
+++ b/zenario/styles/admin_toolbar.css
@@ -1,5 +1,5 @@
  /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/styles/dev_tools.css b/zenario/styles/dev_tools.css
index df1c0d854..defb6b140 100644
--- a/zenario/styles/dev_tools.css
+++ b/zenario/styles/dev_tools.css
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/styles/module.wrapper.css.php b/zenario/styles/module.wrapper.css.php
index 98cdcccb9..6d1939329 100644
--- a/zenario/styles/module.wrapper.css.php
+++ b/zenario/styles/module.wrapper.css.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/styles/organizer.wrapper.css.php b/zenario/styles/organizer.wrapper.css.php
index 47cfbe950..fedf9d097 100644
--- a/zenario/styles/organizer.wrapper.css.php
+++ b/zenario/styles/organizer.wrapper.css.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/styles/skin.cache_wrapper.css.php b/zenario/styles/skin.cache_wrapper.css.php
index 8bab21a83..f7fd033ad 100644
--- a/zenario/styles/skin.cache_wrapper.css.php
+++ b/zenario/styles/skin.cache_wrapper.css.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/visitorheader.inc.php b/zenario/visitorheader.inc.php
index 30dd4a6be..3c56d62a2 100644
--- a/zenario/visitorheader.inc.php
+++ b/zenario/visitorheader.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/wizard.ajax.php b/zenario/wizard.ajax.php
index f7a9c6426..e08ab834c 100644
--- a/zenario/wizard.ajax.php
+++ b/zenario/wizard.ajax.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/zenario/wizard.php b/zenario/wizard.php
index 0dd73c64e..6b79d7d9f 100644
--- a/zenario/wizard.php
+++ b/zenario/wizard.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020, Tribal Limited
+ * Copyright (c) 2021, Tribal Limited
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without