From 6c6077be8d8c9ec28b9e9322fc4bef59b3aba832 Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe <llewellyn@vdm.io>
Date: Wed, 2 Dec 2015 04:42:27 +0200
Subject: [PATCH] Fixed uncaught UIKIT classes to insure it loads one every
 page needed , other changes are only random variable name and date changes
 (due to automation sorry)

---
 README.md                                     |   6 +-
 admin/assets/css/admin.css                    |   2 +-
 admin/assets/css/causerisk.css                |   2 +-
 admin/assets/css/causesrisks.css              |   2 +-
 admin/assets/css/combinedresults.css          |   2 +-
 admin/assets/css/companies.css                |   2 +-
 admin/assets/css/company.css                  |   2 +-
 admin/assets/css/companyresults.css           |   2 +-
 admin/assets/css/countries.css                |   2 +-
 admin/assets/css/country.css                  |   2 +-
 admin/assets/css/currencies.css               |   2 +-
 admin/assets/css/currency.css                 |   2 +-
 admin/assets/css/dashboard.css                |   2 +-
 admin/assets/css/health_data.css              |   2 +-
 admin/assets/css/health_data_sets.css         |   2 +-
 admin/assets/css/help_document.css            |   2 +-
 admin/assets/css/help_documents.css           |   2 +-
 admin/assets/css/intervention.css             |   2 +-
 admin/assets/css/interventions.css            |   2 +-
 admin/assets/css/scaling_factor.css           |   2 +-
 admin/assets/css/scaling_factors.css          |   2 +-
 admin/assets/css/service_provider.css         |   2 +-
 admin/assets/css/service_providers.css        |   2 +-
 admin/config.xml                              |  68 +--
 admin/controller.php                          |   2 +-
 admin/controllers/ajax.json.php               |   2 +-
 admin/controllers/causerisk.php               |  22 +-
 admin/controllers/causesrisks.php             |  32 +-
 admin/controllers/combinedresults.php         |   2 +-
 admin/controllers/companies.php               |  44 +-
 admin/controllers/company.php                 |  22 +-
 admin/controllers/companyresults.php          |   2 +-
 admin/controllers/costbenefitprojection.php   |   2 +-
 admin/controllers/countries.php               |  32 +-
 admin/controllers/country.php                 |  22 +-
 admin/controllers/currencies.php              |  32 +-
 admin/controllers/currency.php                |  22 +-
 admin/controllers/health_data.php             |  22 +-
 admin/controllers/health_data_sets.php        |  32 +-
 admin/controllers/help.php                    |   2 +-
 admin/controllers/help_document.php           |  22 +-
 admin/controllers/help_documents.php          |  32 +-
 admin/controllers/import.php                  |   2 +-
 admin/controllers/intervention.php            |  22 +-
 admin/controllers/interventions.php           |  32 +-
 admin/controllers/scaling_factor.php          |  22 +-
 admin/controllers/scaling_factors.php         |  32 +-
 admin/controllers/service_provider.php        |  22 +-
 admin/controllers/service_providers.php       |  32 +-
 admin/costbenefitprojection.php               |   2 +-
 admin/helpers/costbenefitprojection.php       |  10 +-
 admin/helpers/html/batch_.php                 |   2 +-
 admin/helpers/sum.php                         |   2 +-
 admin/helpers/sumcombine.php                  |   2 +-
 admin/layouts/batchselection.php              |   2 +-
 admin/layouts/causerisk/details_above.php     |   2 +-
 admin/layouts/causerisk/details_left.php      |   2 +-
 admin/layouts/causerisk/publishing.php        |   2 +-
 admin/layouts/causerisk/publlshing.php        |   2 +-
 .../age_groups_percentages_fullwidth.php      |   2 +-
 .../company/age_groups_percentages_left.php   |   2 +-
 .../company/age_groups_percentages_right.php  |   2 +-
 .../company/causerisk_selection_fullwidth.php |   2 +-
 admin/layouts/company/details_above.php       |   2 +-
 admin/layouts/company/details_left.php        |   2 +-
 admin/layouts/company/details_right.php       |   2 +-
 admin/layouts/company/details_under.php       |   2 +-
 .../company/interventions_fullwidth.php       |   4 +-
 admin/layouts/company/publishing.php          |   2 +-
 admin/layouts/company/publlshing.php          |   2 +-
 .../company/scaling_factors_fullwidth.php     |   4 +-
 .../country/age_groups_percentages_left.php   |   2 +-
 .../country/age_groups_percentages_right.php  |   2 +-
 .../country/causerisk_selection_fullwidth.php |   2 +-
 admin/layouts/country/companies_fullwidth.php |   4 +-
 admin/layouts/country/details_above.php       |   2 +-
 admin/layouts/country/details_left.php        |   2 +-
 admin/layouts/country/details_right.php       |   2 +-
 .../country/health_data_totals_left.php       |   2 +-
 .../country/health_data_totals_right.php      |   2 +-
 .../country/public_details_fullwidth.php      |   2 +-
 admin/layouts/country/publishing.php          |   2 +-
 admin/layouts/country/publlshing.php          |   2 +-
 .../country/service_providers_fullwidth.php   |   4 +-
 admin/layouts/currency/details_above.php      |   2 +-
 admin/layouts/currency/details_left.php       |   2 +-
 admin/layouts/currency/details_right.php      |   2 +-
 admin/layouts/currency/publishing.php         |   2 +-
 admin/layouts/currency/publlshing.php         |   2 +-
 admin/layouts/health_data/details_above.php   |   2 +-
 admin/layouts/health_data/details_left.php    |   2 +-
 admin/layouts/health_data/details_right.php   |   2 +-
 .../layouts/health_data/details_rightside.php |   2 +-
 admin/layouts/health_data/publishing.php      |   2 +-
 admin/layouts/health_data/publlshing.php      |   2 +-
 admin/layouts/help_document/details_above.php |   2 +-
 .../help_document/details_fullwidth.php       |   2 +-
 admin/layouts/help_document/details_left.php  |   2 +-
 admin/layouts/help_document/details_right.php |   2 +-
 admin/layouts/help_document/details_under.php |   2 +-
 admin/layouts/help_document/publishing.php    |   2 +-
 admin/layouts/help_document/publlshing.php    |   2 +-
 admin/layouts/intervention/details_above.php  |   2 +-
 .../intervention/details_fullwidth.php        |   2 +-
 admin/layouts/intervention/details_under.php  |   2 +-
 admin/layouts/intervention/publishing.php     |   2 +-
 admin/layouts/intervention/publlshing.php     |   2 +-
 .../intervention/settings_fullwidth.php       |   2 +-
 admin/layouts/intervention/settings_left.php  |   2 +-
 .../layouts/scaling_factor/details_above.php  |   2 +-
 admin/layouts/scaling_factor/details_left.php |   2 +-
 .../layouts/scaling_factor/details_right.php  |   2 +-
 admin/layouts/scaling_factor/publishing.php   |   2 +-
 admin/layouts/scaling_factor/publlshing.php   |   2 +-
 .../service_provider/companies_fullwidth.php  |   4 +-
 .../service_provider/details_above.php        |   2 +-
 .../service_provider/details_fullwidth.php    |   2 +-
 admin/layouts/service_provider/publishing.php |   2 +-
 admin/layouts/service_provider/publlshing.php |   2 +-
 admin/models/ajax.php                         |   6 +-
 admin/models/causerisk.php                    | 114 ++--
 admin/models/causesrisks.php                  |  76 +--
 admin/models/combinedresults.php              | 160 +++---
 admin/models/companies.php                    | 124 ++---
 admin/models/company.php                      | 354 ++++++------
 admin/models/companyresults.php               | 158 +++---
 admin/models/costbenefitprojection.php        |   4 +-
 admin/models/countries.php                    |  82 +--
 admin/models/country.php                      | 218 ++++----
 admin/models/currencies.php                   |  76 +--
 admin/models/currency.php                     | 114 ++--
 admin/models/fields/articles.php              |  22 +-
 admin/models/fields/causesrisks.php           |  22 +-
 admin/models/fields/causesriskscheck.php      |   2 +-
 admin/models/fields/company.php               |  22 +-
 admin/models/fields/countries.php             |  22 +-
 admin/models/fields/countryuser.php           |   2 +-
 admin/models/fields/currency.php              |  22 +-
 admin/models/fields/datayear.php              |  22 +-
 admin/models/fields/interventions.php         |  22 +-
 admin/models/fields/memberuser.php            |   2 +-
 admin/models/fields/serviceprovider.php       |  22 +-
 admin/models/fields/serviceprovideruser.php   |   2 +-
 admin/models/forms/causerisk.js               |   2 +-
 admin/models/forms/causerisk.xml              |  38 +-
 admin/models/forms/company.js                 |  96 ++--
 admin/models/forms/company.xml                |  92 ++--
 admin/models/forms/country.js                 |   2 +-
 admin/models/forms/country.xml                | 130 ++---
 admin/models/forms/currency.js                |   2 +-
 admin/models/forms/currency.xml               |  48 +-
 admin/models/forms/health_data.js             |   2 +-
 admin/models/forms/health_data.xml            |  68 +--
 admin/models/forms/help_document.js           | 174 +++---
 admin/models/forms/help_document.xml          |  56 +-
 admin/models/forms/intervention.js            |  36 +-
 admin/models/forms/intervention.xml           |  60 +--
 admin/models/forms/scaling_factor.js          |   2 +-
 admin/models/forms/scaling_factor.xml         |  46 +-
 admin/models/forms/service_provider.js        |   2 +-
 admin/models/forms/service_provider.xml       |  40 +-
 admin/models/health_data.php                  | 188 +++----
 admin/models/health_data_sets.php             |  94 ++--
 admin/models/help_document.php                | 128 ++---
 admin/models/help_documents.php               |  92 ++--
 admin/models/import.php                       |   2 +-
 admin/models/intervention.php                 | 124 ++---
 admin/models/interventions.php                |  86 +--
 admin/models/scaling_factor.php               | 110 ++--
 admin/models/scaling_factors.php              |  76 +--
 admin/models/service_provider.php             | 174 +++---
 admin/models/service_providers.php            |  74 +--
 admin/tables/causerisk.php                    |   4 +-
 admin/tables/company.php                      |   4 +-
 admin/tables/country.php                      |   4 +-
 admin/tables/currency.php                     |   4 +-
 admin/tables/health_data.php                  |   4 +-
 admin/tables/help_document.php                |   4 +-
 admin/tables/intervention.php                 |   4 +-
 admin/tables/scaling_factor.php               |   4 +-
 admin/tables/service_provider.php             |   4 +-
 admin/views/causerisk/submitbutton.js         |   2 +-
 admin/views/causerisk/tmpl/edit.php           |   2 +-
 admin/views/causerisk/view.html.php           |  22 +-
 admin/views/causesrisks/tmpl/default.php      |   2 +-
 .../causesrisks/tmpl/default_batch_body.php   |   2 +-
 .../causesrisks/tmpl/default_batch_footer.php |   2 +-
 admin/views/causesrisks/tmpl/default_body.php |   2 +-
 admin/views/causesrisks/tmpl/default_foot.php |   2 +-
 admin/views/causesrisks/tmpl/default_head.php |   2 +-
 .../causesrisks/tmpl/default_toolbar.php      |   2 +-
 admin/views/causesrisks/view.html.php         |   2 +-
 admin/views/combinedresults/tmpl/default.php  |   2 +-
 .../tmpl/default_chart_cost.php               |   2 +-
 .../tmpl/default_chart_cost_percent.php       |   2 +-
 ...efault_chart_intervention_cost_benefit.php |   2 +-
 .../tmpl/default_chart_work_days_lost.php     |   2 +-
 .../default_chart_work_days_lost_percent.php  |   2 +-
 .../combinedresults/tmpl/default_main.php     |   2 +-
 ...efault_table_calculated_cost_in_detail.php |   2 +-
 .../tmpl/default_table_cost_summary.php       |   2 +-
 ...default_table_intervention_net_benefit.php |   2 +-
 .../default_table_work_days_lost_summary.php  |   2 +-
 admin/views/combinedresults/view.html.php     |  56 +-
 admin/views/companies/tmpl/default.php        |   2 +-
 .../companies/tmpl/default_batch_body.php     |   2 +-
 .../companies/tmpl/default_batch_footer.php   |   2 +-
 admin/views/companies/tmpl/default_body.php   |   2 +-
 admin/views/companies/tmpl/default_foot.php   |   2 +-
 admin/views/companies/tmpl/default_head.php   |   2 +-
 .../views/companies/tmpl/default_toolbar.php  |   2 +-
 admin/views/companies/view.html.php           |  56 +-
 admin/views/company/submitbutton.js           |   2 +-
 admin/views/company/tmpl/edit.php             |  22 +-
 admin/views/company/view.html.php             |  38 +-
 admin/views/companyresults/tmpl/default.php   |   2 +-
 .../tmpl/default_chart_cost.php               |   2 +-
 .../tmpl/default_chart_cost_percent.php       |   2 +-
 ...efault_chart_intervention_cost_benefit.php |   2 +-
 .../tmpl/default_chart_work_days_lost.php     |   2 +-
 .../default_chart_work_days_lost_percent.php  |   2 +-
 .../companyresults/tmpl/default_main.php      |   2 +-
 ...efault_table_calculated_cost_in_detail.php |   2 +-
 .../tmpl/default_table_cost_summary.php       |   2 +-
 ...default_table_intervention_net_benefit.php |   2 +-
 .../default_table_work_days_lost_summary.php  |   2 +-
 .../companyresults/tmpl/default_variables.php |   2 +-
 admin/views/companyresults/view.html.php      |  68 +--
 .../costbenefitprojection/tmpl/default.php    |   2 +-
 .../tmpl/default_main.php                     |   2 +-
 .../tmpl/default_vdm.php                      |   2 +-
 .../views/costbenefitprojection/view.html.php |   2 +-
 admin/views/countries/tmpl/default.php        |   2 +-
 .../countries/tmpl/default_batch_body.php     |   2 +-
 .../countries/tmpl/default_batch_footer.php   |   2 +-
 admin/views/countries/tmpl/default_body.php   |   2 +-
 admin/views/countries/tmpl/default_foot.php   |   2 +-
 admin/views/countries/tmpl/default_head.php   |   2 +-
 .../views/countries/tmpl/default_toolbar.php  |   2 +-
 admin/views/countries/view.html.php           |   8 +-
 admin/views/country/submitbutton.js           |   2 +-
 admin/views/country/tmpl/edit.php             |   2 +-
 admin/views/country/view.html.php             |  38 +-
 admin/views/currencies/tmpl/default.php       |   2 +-
 .../currencies/tmpl/default_batch_body.php    |   2 +-
 .../currencies/tmpl/default_batch_footer.php  |   2 +-
 admin/views/currencies/tmpl/default_body.php  |   2 +-
 admin/views/currencies/tmpl/default_foot.php  |   2 +-
 admin/views/currencies/tmpl/default_head.php  |   2 +-
 .../views/currencies/tmpl/default_toolbar.php |   2 +-
 admin/views/currencies/view.html.php          |   2 +-
 admin/views/currency/submitbutton.js          |   2 +-
 admin/views/currency/tmpl/edit.php            |   2 +-
 admin/views/currency/view.html.php            |  22 +-
 admin/views/health_data/submitbutton.js       |   2 +-
 admin/views/health_data/tmpl/edit.php         |   2 +-
 admin/views/health_data/view.html.php         |  22 +-
 admin/views/health_data_sets/tmpl/default.php |   2 +-
 .../tmpl/default_batch_body.php               |   2 +-
 .../tmpl/default_batch_footer.php             |   2 +-
 .../health_data_sets/tmpl/default_body.php    |   2 +-
 .../health_data_sets/tmpl/default_foot.php    |   2 +-
 .../health_data_sets/tmpl/default_head.php    |   2 +-
 .../health_data_sets/tmpl/default_toolbar.php |   2 +-
 admin/views/health_data_sets/view.html.php    |  34 +-
 admin/views/help_document/submitbutton.js     |   2 +-
 admin/views/help_document/tmpl/edit.php       |  62 +--
 admin/views/help_document/view.html.php       |  22 +-
 admin/views/help_documents/tmpl/default.php   |   2 +-
 .../tmpl/default_batch_body.php               |   2 +-
 .../tmpl/default_batch_footer.php             |   2 +-
 .../help_documents/tmpl/default_body.php      |   2 +-
 .../help_documents/tmpl/default_foot.php      |   2 +-
 .../help_documents/tmpl/default_head.php      |   2 +-
 .../help_documents/tmpl/default_toolbar.php   |   2 +-
 admin/views/help_documents/view.html.php      |  74 +--
 admin/views/import/tmpl/default.php           |   2 +-
 admin/views/import/view.html.php              |   2 +-
 admin/views/intervention/submitbutton.js      |   2 +-
 admin/views/intervention/tmpl/edit.php        |  22 +-
 admin/views/intervention/view.html.php        |  24 +-
 admin/views/interventions/tmpl/default.php    |   2 +-
 .../interventions/tmpl/default_batch_body.php |   2 +-
 .../tmpl/default_batch_footer.php             |   2 +-
 .../views/interventions/tmpl/default_body.php |   2 +-
 .../views/interventions/tmpl/default_foot.php |   2 +-
 .../views/interventions/tmpl/default_head.php |   2 +-
 .../interventions/tmpl/default_toolbar.php    |   2 +-
 admin/views/interventions/view.html.php       |  60 +--
 admin/views/scaling_factor/submitbutton.js    |   2 +-
 admin/views/scaling_factor/tmpl/edit.php      |   2 +-
 admin/views/scaling_factor/view.html.php      |  22 +-
 admin/views/scaling_factors/tmpl/default.php  |   2 +-
 .../tmpl/default_batch_body.php               |   2 +-
 .../tmpl/default_batch_footer.php             |   2 +-
 .../scaling_factors/tmpl/default_body.php     |   2 +-
 .../scaling_factors/tmpl/default_foot.php     |   2 +-
 .../scaling_factors/tmpl/default_head.php     |   2 +-
 .../scaling_factors/tmpl/default_toolbar.php  |   2 +-
 admin/views/scaling_factors/view.html.php     |  14 +-
 admin/views/service_provider/submitbutton.js  |   2 +-
 admin/views/service_provider/tmpl/edit.php    |   2 +-
 admin/views/service_provider/view.html.php    |  34 +-
 .../views/service_providers/tmpl/default.php  |   2 +-
 .../tmpl/default_batch_body.php               |   2 +-
 .../tmpl/default_batch_footer.php             |   2 +-
 .../service_providers/tmpl/default_body.php   |   2 +-
 .../service_providers/tmpl/default_foot.php   |   2 +-
 .../service_providers/tmpl/default_head.php   |   2 +-
 .../tmpl/default_toolbar.php                  |   2 +-
 admin/views/service_providers/view.html.php   |   8 +-
 costbenefitprojection.xml                     |   4 +-
 script.php                                    | 510 +++++++++---------
 site/assets/css/combinedresults.css           |   2 +-
 site/assets/css/company.css                   |   2 +-
 site/assets/css/companyresults.css            |   2 +-
 site/assets/css/cpanel.css                    |   2 +-
 site/assets/css/createaccount.css             |   2 +-
 site/assets/css/intervention.css              |   2 +-
 site/assets/css/scaling_factor.css            |   2 +-
 site/assets/css/site.css                      |   2 +-
 site/controller.php                           |   2 +-
 site/controllers/ajax.json.php                |   2 +-
 site/controllers/company.php                  |  22 +-
 site/controllers/help.php                     |   2 +-
 site/controllers/intervention.php             |  22 +-
 site/controllers/scaling_factor.php           |  22 +-
 site/costbenefitprojection.php                |   2 +-
 site/helpers/costbenefitprojection.php        |  10 +-
 site/helpers/headercheck.php                  |   2 +-
 site/helpers/route.php                        |  34 +-
 site/layouts/appnotice.php                    |   2 +-
 .../age_groups_percentages_fullwidth.php      |   2 +-
 .../company/age_groups_percentages_left.php   |   2 +-
 .../company/age_groups_percentages_right.php  |   2 +-
 .../company/causerisk_selection_fullwidth.php |   2 +-
 site/layouts/company/details_above.php        |   2 +-
 site/layouts/company/details_left.php         |   2 +-
 site/layouts/company/details_right.php        |   2 +-
 site/layouts/company/details_under.php        |   2 +-
 .../company/interventions_fullwidth.php       |   4 +-
 site/layouts/company/publishing.php           |   2 +-
 site/layouts/company/publlshing.php           |   2 +-
 .../company/scaling_factors_fullwidth.php     |   4 +-
 site/layouts/companydetails.php               |   2 +-
 site/layouts/intervention/details_above.php   |   2 +-
 .../intervention/details_fullwidth.php        |   2 +-
 site/layouts/intervention/details_under.php   |   2 +-
 site/layouts/intervention/publishing.php      |   2 +-
 site/layouts/intervention/publlshing.php      |   2 +-
 .../intervention/settings_fullwidth.php       |   2 +-
 site/layouts/intervention/settings_left.php   |   2 +-
 site/layouts/scaling_factor/details_above.php |   2 +-
 site/layouts/scaling_factor/details_left.php  |   2 +-
 site/layouts/scaling_factor/details_right.php |   2 +-
 site/layouts/scaling_factor/publishing.php    |   2 +-
 site/layouts/scaling_factor/publlshing.php    |   2 +-
 site/models/ajax.php                          |   6 +-
 site/models/combinedresults.php               | 160 +++---
 site/models/company.php                       | 354 ++++++------
 site/models/companyresults.php                | 158 +++---
 site/models/cpanel.php                        |  86 +--
 site/models/createaccount.php                 |  36 +-
 site/models/forms/company.js                  |  96 ++--
 site/models/forms/company.xml                 |  92 ++--
 site/models/forms/intervention.js             |  36 +-
 site/models/forms/intervention.xml            |  60 +--
 site/models/forms/scaling_factor.js           |   2 +-
 site/models/forms/scaling_factor.xml          |  46 +-
 site/models/intervention.php                  | 124 ++---
 site/models/scaling_factor.php                | 110 ++--
 site/router.php                               |   2 +-
 site/views/combinedresults/tmpl/default.php   |   2 +-
 .../tmpl/default_chart_cost.php               |   2 +-
 .../tmpl/default_chart_cost_percent.php       |   2 +-
 ...efault_chart_intervention_cost_benefit.php |   2 +-
 ...t_chart_intervention_cost_benefit_save.php |   2 +-
 .../tmpl/default_chart_work_days_lost.php     |   2 +-
 .../default_chart_work_days_lost_percent.php  |   2 +-
 ...efault_table_calculated_cost_in_detail.php |   2 +-
 .../tmpl/default_table_cost_summary.php       |   2 +-
 ...default_table_intervention_net_benefit.php |   2 +-
 .../default_table_work_days_lost_summary.php  |   2 +-
 site/views/combinedresults/view.html.php      |  52 +-
 site/views/company/submitbutton.js            |   2 +-
 site/views/company/tmpl/edit.php              |  22 +-
 site/views/company/view.html.php              |  38 +-
 site/views/companyresults/tmpl/default.php    |   2 +-
 .../tmpl/default_chart_cost.php               |   2 +-
 .../tmpl/default_chart_cost_percent.php       |   2 +-
 ...efault_chart_intervention_cost_benefit.php |   2 +-
 ...t_chart_intervention_cost_benefit_save.php |   2 +-
 .../tmpl/default_chart_work_days_lost.php     |   2 +-
 .../default_chart_work_days_lost_percent.php  |   2 +-
 ...efault_table_calculated_cost_in_detail.php |   2 +-
 .../tmpl/default_table_cost_summary.php       |   2 +-
 ...default_table_intervention_net_benefit.php |   2 +-
 .../default_table_work_days_lost_summary.php  |   2 +-
 site/views/companyresults/view.html.php       |  52 +-
 site/views/cpanel/tmpl/default.php            |   2 +-
 site/views/cpanel/view.html.php               |  66 +--
 site/views/createaccount/tmpl/default.php     |   4 +-
 site/views/createaccount/view.html.php        |  47 +-
 site/views/intervention/submitbutton.js       |   2 +-
 site/views/intervention/tmpl/edit.php         |  22 +-
 site/views/intervention/view.html.php         |  24 +-
 site/views/scaling_factor/submitbutton.js     |   2 +-
 site/views/scaling_factor/tmpl/edit.php       |   2 +-
 site/views/scaling_factor/view.html.php       |  22 +-
 409 files changed, 3981 insertions(+), 3980 deletions(-)

diff --git a/README.md b/README.md
index c5b048c0..a102061f 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Cost Benefit Projection (3.0.8)
+# Cost Benefit Projection (3.0.9)
 
 This is a [Joomla 3.x] (http://www.joomla.org/) component.
 
@@ -23,10 +23,10 @@ max_input_vars = 5000
 + *Name*: [Cost Benefit Projection] (https://www.staffhealthcbp.com/)
 + *First Build*: 15th June, 2012
 + *Last Build*: 2nd December, 2015
-+ *Version*: 3.0.8
++ *Version*: 3.0.9
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-+ *Line count*: **78133**
++ *Line count*: **78134**
 + *File count*: **528**
 + *Folder count*: **99**
 
diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css
index db89a16c..431ac9e3 100644
--- a/admin/assets/css/admin.css
+++ b/admin/assets/css/admin.css
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/assets/css/causerisk.css b/admin/assets/css/causerisk.css
index b54965e7..abba1c8b 100644
--- a/admin/assets/css/causerisk.css
+++ b/admin/assets/css/causerisk.css
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/assets/css/causesrisks.css b/admin/assets/css/causesrisks.css
index 824b8ec2..8e76e633 100644
--- a/admin/assets/css/causesrisks.css
+++ b/admin/assets/css/causesrisks.css
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/assets/css/combinedresults.css b/admin/assets/css/combinedresults.css
index 821844fe..b291601b 100644
--- a/admin/assets/css/combinedresults.css
+++ b/admin/assets/css/combinedresults.css
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/assets/css/companies.css b/admin/assets/css/companies.css
index 959897db..1993ea81 100644
--- a/admin/assets/css/companies.css
+++ b/admin/assets/css/companies.css
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/assets/css/company.css b/admin/assets/css/company.css
index c2a29a98..5caf8a77 100644
--- a/admin/assets/css/company.css
+++ b/admin/assets/css/company.css
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/assets/css/companyresults.css b/admin/assets/css/companyresults.css
index 08cf7496..95337f63 100644
--- a/admin/assets/css/companyresults.css
+++ b/admin/assets/css/companyresults.css
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/assets/css/countries.css b/admin/assets/css/countries.css
index 83891793..f8d147f1 100644
--- a/admin/assets/css/countries.css
+++ b/admin/assets/css/countries.css
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/assets/css/country.css b/admin/assets/css/country.css
index f6688d02..cf293624 100644
--- a/admin/assets/css/country.css
+++ b/admin/assets/css/country.css
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/assets/css/currencies.css b/admin/assets/css/currencies.css
index bd709848..a9e1062b 100644
--- a/admin/assets/css/currencies.css
+++ b/admin/assets/css/currencies.css
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/assets/css/currency.css b/admin/assets/css/currency.css
index 94edbbb8..05129be7 100644
--- a/admin/assets/css/currency.css
+++ b/admin/assets/css/currency.css
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css
index 4a061047..bf4bf2ce 100644
--- a/admin/assets/css/dashboard.css
+++ b/admin/assets/css/dashboard.css
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/assets/css/health_data.css b/admin/assets/css/health_data.css
index f35ff889..912d3c05 100644
--- a/admin/assets/css/health_data.css
+++ b/admin/assets/css/health_data.css
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/assets/css/health_data_sets.css b/admin/assets/css/health_data_sets.css
index de56442a..8419d23e 100644
--- a/admin/assets/css/health_data_sets.css
+++ b/admin/assets/css/health_data_sets.css
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/assets/css/help_document.css b/admin/assets/css/help_document.css
index 12cee3f5..ac7edb12 100644
--- a/admin/assets/css/help_document.css
+++ b/admin/assets/css/help_document.css
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/assets/css/help_documents.css b/admin/assets/css/help_documents.css
index e882bfe4..693e94c3 100644
--- a/admin/assets/css/help_documents.css
+++ b/admin/assets/css/help_documents.css
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/assets/css/intervention.css b/admin/assets/css/intervention.css
index 70dcbe13..0fe432c3 100644
--- a/admin/assets/css/intervention.css
+++ b/admin/assets/css/intervention.css
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/assets/css/interventions.css b/admin/assets/css/interventions.css
index ac4b501a..415956d5 100644
--- a/admin/assets/css/interventions.css
+++ b/admin/assets/css/interventions.css
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/assets/css/scaling_factor.css b/admin/assets/css/scaling_factor.css
index daba4481..70f6e3b0 100644
--- a/admin/assets/css/scaling_factor.css
+++ b/admin/assets/css/scaling_factor.css
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/assets/css/scaling_factors.css b/admin/assets/css/scaling_factors.css
index bcf0fad7..86fd590b 100644
--- a/admin/assets/css/scaling_factors.css
+++ b/admin/assets/css/scaling_factors.css
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/assets/css/service_provider.css b/admin/assets/css/service_provider.css
index 51947bdf..8575c802 100644
--- a/admin/assets/css/service_provider.css
+++ b/admin/assets/css/service_provider.css
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/assets/css/service_providers.css b/admin/assets/css/service_providers.css
index bb74ea0b..301e132a 100644
--- a/admin/assets/css/service_providers.css
+++ b/admin/assets/css/service_providers.css
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/config.xml b/admin/config.xml
index 28453379..5bdc4411 100644
--- a/admin/config.xml
+++ b/admin/config.xml
@@ -355,7 +355,7 @@
 			multiple="true"
 		/>
 
-		<!-- [11374] Memberbasicgroup Field. Type: Usergroup. (joomla) -->
+		<!-- [11375] Memberbasicgroup Field. Type: Usergroup. (joomla) -->
 		<field
 			type="usergroup"
 			name="memberbasicgroup"
@@ -363,7 +363,7 @@
 			description="COM_COSTBENEFITPROJECTION_CONFIG_MEMBERBASICGROUP_DESCRIPTION"
 			multiple="true"
 		/>		
-		<!-- [11374] Advancedmembergroup Field. Type: Usergroup. (joomla) -->
+		<!-- [11375] Advancedmembergroup Field. Type: Usergroup. (joomla) -->
 		<field
 			type="usergroup"
 			name="advancedmembergroup"
@@ -382,7 +382,7 @@
 			description="COM_COSTBENEFITPROJECTION_CONFIG_UIKIT_LOAD_DESC"
 			class="btn-group btn-group-yesno"
 			default="">
-			<!-- [13247] Option Set. -->
+			<!-- [13248] Option Set. -->
 			<option value="">
 				COM_COSTBENEFITPROJECTION_CONFIG_AUTO_LOAD</option>"
 			<option value="1">
@@ -398,7 +398,7 @@
 			description="COM_COSTBENEFITPROJECTION_CONFIG_UIKIT_MIN_DESC"
 			class="btn-group btn-group-yesno"
 			default="">
-			<!-- [13272] Option Set. -->
+			<!-- [13273] Option Set. -->
 			<option value="">
 				COM_COSTBENEFITPROJECTION_CONFIG_NO</option>"
 			<option value=".min">
@@ -410,7 +410,7 @@
 			description="COM_COSTBENEFITPROJECTION_CONFIG_UIKIT_STYLE_DESC"
 			class="btn-group btn-group-yesno"
 			default="">
-			<!-- [13293] Option Set. -->
+			<!-- [13294] Option Set. -->
 			<option value="">
 				COM_COSTBENEFITPROJECTION_CONFIG_FLAT_LOAD</option>"
 			<option value=".almost-flat">
@@ -426,7 +426,7 @@
 		description="COM_COSTBENEFITPROJECTION_CONFIG_CHART_SETTINGS_DESC">
 		
 		<field type="note" name="chart_admin_naote" class="alert alert-info" label="COM_COSTBENEFITPROJECTION_CONFIG_ADMIN_CHART_NOTE_LABEL" description="COM_COSTBENEFITPROJECTION_CONFIG_ADMIN_CHART_NOTE_DESC"  />
-		<!-- [13325] Admin_chartbackground Field. Type: Color. -->
+		<!-- [13326] Admin_chartbackground Field. Type: Color. -->
 		<field
 			type="color"
 			name="admin_chartbackground"
@@ -434,7 +434,7 @@
 			label="COM_COSTBENEFITPROJECTION_CONFIG_CHARTBACKGROUND_LABEL"
 			description="COM_COSTBENEFITPROJECTION_CONFIG_CHARTBACKGROUND_DESC"
 		/>		
-		<!-- [13333] Admin_mainwidth Field. Type: Text. -->
+		<!-- [13334] Admin_mainwidth Field. Type: Text. -->
 		<field
 			type="text"
 			name="admin_mainwidth"
@@ -447,9 +447,9 @@
 			message="Error! Please add area width here."
 			hint="COM_COSTBENEFITPROJECTION_CONFIG_MAINWIDTH_HINT"
 		/>		
-		<!-- [13346] Spacer_chartadmin_hr_a Field. Type: Spacer. A None Database Field. -->
+		<!-- [13347] Spacer_chartadmin_hr_a Field. Type: Spacer. A None Database Field. -->
 		<field type="spacer" name="spacer_chartadmin_hr_a" hr="true" class="spacer_chartadmin_hr_a" />		
-		<!-- [13348] Admin_chartareatop Field. Type: Text. -->
+		<!-- [13349] Admin_chartareatop Field. Type: Text. -->
 		<field
 			type="text"
 			name="admin_chartareatop"
@@ -462,7 +462,7 @@
 			message="Error! Please add top spacing here."
 			hint="COM_COSTBENEFITPROJECTION_CONFIG_CHARTAREATOP_HINT"
 		/>		
-		<!-- [13361] Admin_chartarealeft Field. Type: Text. -->
+		<!-- [13362] Admin_chartarealeft Field. Type: Text. -->
 		<field
 			type="text"
 			name="admin_chartarealeft"
@@ -475,7 +475,7 @@
 			message="Error! Please add left spacing here."
 			hint="COM_COSTBENEFITPROJECTION_CONFIG_CHARTAREALEFT_HINT"
 		/>		
-		<!-- [13374] Admin_chartareawidth Field. Type: Text. -->
+		<!-- [13375] Admin_chartareawidth Field. Type: Text. -->
 		<field
 			type="text"
 			name="admin_chartareawidth"
@@ -488,9 +488,9 @@
 			message="Error! Please add chart width here."
 			hint="COM_COSTBENEFITPROJECTION_CONFIG_CHARTAREAWIDTH_HINT"
 		/>		
-		<!-- [13387] Spacer_chartadmin_hr_b Field. Type: Spacer. A None Database Field. -->
+		<!-- [13388] Spacer_chartadmin_hr_b Field. Type: Spacer. A None Database Field. -->
 		<field type="spacer" name="spacer_chartadmin_hr_b" hr="true" class="spacer_chartadmin_hr_b" />		
-		<!-- [13389] Admin_legendtextstylefontcolor Field. Type: Color. -->
+		<!-- [13390] Admin_legendtextstylefontcolor Field. Type: Color. -->
 		<field
 			type="color"
 			name="admin_legendtextstylefontcolor"
@@ -498,7 +498,7 @@
 			label="COM_COSTBENEFITPROJECTION_CONFIG_LEGENDTEXTSTYLEFONTCOLOR_LABEL"
 			description="COM_COSTBENEFITPROJECTION_CONFIG_LEGENDTEXTSTYLEFONTCOLOR_DESC"
 		/>		
-		<!-- [13397] Admin_legendtextstylefontsize Field. Type: Text. -->
+		<!-- [13398] Admin_legendtextstylefontsize Field. Type: Text. -->
 		<field
 			type="text"
 			name="admin_legendtextstylefontsize"
@@ -511,9 +511,9 @@
 			message="Error! Please add size of the legend here."
 			hint="COM_COSTBENEFITPROJECTION_CONFIG_LEGENDTEXTSTYLEFONTSIZE_HINT"
 		/>		
-		<!-- [13410] Spacer_chartadmin_hr_c Field. Type: Spacer. A None Database Field. -->
+		<!-- [13411] Spacer_chartadmin_hr_c Field. Type: Spacer. A None Database Field. -->
 		<field type="spacer" name="spacer_chartadmin_hr_c" hr="true" class="spacer_chartadmin_hr_c" />		
-		<!-- [13412] Admin_vaxistextstylefontcolor Field. Type: Color. -->
+		<!-- [13413] Admin_vaxistextstylefontcolor Field. Type: Color. -->
 		<field
 			type="color"
 			name="admin_vaxistextstylefontcolor"
@@ -521,9 +521,9 @@
 			label="COM_COSTBENEFITPROJECTION_CONFIG_VAXISTEXTSTYLEFONTCOLOR_LABEL"
 			description="COM_COSTBENEFITPROJECTION_CONFIG_VAXISTEXTSTYLEFONTCOLOR_DESC"
 		/>		
-		<!-- [13420] Spacer_chartadmin_hr_d Field. Type: Spacer. A None Database Field. -->
+		<!-- [13421] Spacer_chartadmin_hr_d Field. Type: Spacer. A None Database Field. -->
 		<field type="spacer" name="spacer_chartadmin_hr_d" hr="true" class="spacer_chartadmin_hr_d" />		
-		<!-- [13422] Admin_haxistextstylefontcolor Field. Type: Color. -->
+		<!-- [13423] Admin_haxistextstylefontcolor Field. Type: Color. -->
 		<field
 			type="color"
 			name="admin_haxistextstylefontcolor"
@@ -531,7 +531,7 @@
 			label="COM_COSTBENEFITPROJECTION_CONFIG_HAXISTEXTSTYLEFONTCOLOR_LABEL"
 			description="COM_COSTBENEFITPROJECTION_CONFIG_HAXISTEXTSTYLEFONTCOLOR_DESC"
 		/>		
-		<!-- [13430] Admin_haxistitletextstylefontcolor Field. Type: Color. -->
+		<!-- [13431] Admin_haxistitletextstylefontcolor Field. Type: Color. -->
 		<field
 			type="color"
 			name="admin_haxistitletextstylefontcolor"
@@ -542,7 +542,7 @@
 		
 		<field type="note" name="chart_site_note" class="alert alert-info" label="COM_COSTBENEFITPROJECTION_CONFIG_SITE_CHART_NOTE_LABEL" description="COM_COSTBENEFITPROJECTION_CONFIG_SITE_CHART_NOTE_DESC"  />
 		
-		<!-- [13441] Site_chartbackground Field. Type: Color. -->
+		<!-- [13442] Site_chartbackground Field. Type: Color. -->
 		<field
 			type="color"
 			name="site_chartbackground"
@@ -550,7 +550,7 @@
 			label="COM_COSTBENEFITPROJECTION_CONFIG_CHARTBACKGROUND_LABEL"
 			description="COM_COSTBENEFITPROJECTION_CONFIG_CHARTBACKGROUND_DESC"
 		/>		
-		<!-- [13449] Site_mainwidth Field. Type: Text. -->
+		<!-- [13450] Site_mainwidth Field. Type: Text. -->
 		<field
 			type="text"
 			name="site_mainwidth"
@@ -563,9 +563,9 @@
 			message="Error! Please add area width here."
 			hint="COM_COSTBENEFITPROJECTION_CONFIG_MAINWIDTH_HINT"
 		/>		
-		<!-- [13462] Spacer_chartsite_hr_a Field. Type: Spacer. A None Database Field. -->
+		<!-- [13463] Spacer_chartsite_hr_a Field. Type: Spacer. A None Database Field. -->
 		<field type="spacer" name="spacer_chartsite_hr_a" hr="true" class="spacer_chartsite_hr_a" />		
-		<!-- [13464] Site_chartareatop Field. Type: Text. -->
+		<!-- [13465] Site_chartareatop Field. Type: Text. -->
 		<field
 			type="text"
 			name="site_chartareatop"
@@ -578,7 +578,7 @@
 			message="Error! Please add top spacing here."
 			hint="COM_COSTBENEFITPROJECTION_CONFIG_CHARTAREATOP_HINT"
 		/>		
-		<!-- [13477] Site_chartarealeft Field. Type: Text. -->
+		<!-- [13478] Site_chartarealeft Field. Type: Text. -->
 		<field
 			type="text"
 			name="site_chartarealeft"
@@ -591,7 +591,7 @@
 			message="Error! Please add left spacing here."
 			hint="COM_COSTBENEFITPROJECTION_CONFIG_CHARTAREALEFT_HINT"
 		/>		
-		<!-- [13490] Site_chartareawidth Field. Type: Text. -->
+		<!-- [13491] Site_chartareawidth Field. Type: Text. -->
 		<field
 			type="text"
 			name="site_chartareawidth"
@@ -604,9 +604,9 @@
 			message="Error! Please add chart width here."
 			hint="COM_COSTBENEFITPROJECTION_CONFIG_CHARTAREAWIDTH_HINT"
 		/>		
-		<!-- [13503] Spacer_chartsite_hr_b Field. Type: Spacer. A None Database Field. -->
+		<!-- [13504] Spacer_chartsite_hr_b Field. Type: Spacer. A None Database Field. -->
 		<field type="spacer" name="spacer_chartsite_hr_b" hr="true" class="spacer_chartsite_hr_b" />		
-		<!-- [13505] Site_legendtextstylefontcolor Field. Type: Color. -->
+		<!-- [13506] Site_legendtextstylefontcolor Field. Type: Color. -->
 		<field
 			type="color"
 			name="site_legendtextstylefontcolor"
@@ -614,7 +614,7 @@
 			label="COM_COSTBENEFITPROJECTION_CONFIG_LEGENDTEXTSTYLEFONTCOLOR_LABEL"
 			description="COM_COSTBENEFITPROJECTION_CONFIG_LEGENDTEXTSTYLEFONTCOLOR_DESC"
 		/>		
-		<!-- [13513] Site_legendtextstylefontsize Field. Type: Text. -->
+		<!-- [13514] Site_legendtextstylefontsize Field. Type: Text. -->
 		<field
 			type="text"
 			name="site_legendtextstylefontsize"
@@ -627,9 +627,9 @@
 			message="Error! Please add size of the legend here."
 			hint="COM_COSTBENEFITPROJECTION_CONFIG_LEGENDTEXTSTYLEFONTSIZE_HINT"
 		/>		
-		<!-- [13526] Spacer_chartsite_hr_c Field. Type: Spacer. A None Database Field. -->
+		<!-- [13527] Spacer_chartsite_hr_c Field. Type: Spacer. A None Database Field. -->
 		<field type="spacer" name="spacer_chartsite_hr_c" hr="true" class="spacer_chartsite_hr_c" />		
-		<!-- [13528] Site_vaxistextstylefontcolor Field. Type: Color. -->
+		<!-- [13529] Site_vaxistextstylefontcolor Field. Type: Color. -->
 		<field
 			type="color"
 			name="site_vaxistextstylefontcolor"
@@ -637,9 +637,9 @@
 			label="COM_COSTBENEFITPROJECTION_CONFIG_VAXISTEXTSTYLEFONTCOLOR_LABEL"
 			description="COM_COSTBENEFITPROJECTION_CONFIG_VAXISTEXTSTYLEFONTCOLOR_DESC"
 		/>		
-		<!-- [13536] Spacer_chartsite_hr_d Field. Type: Spacer. A None Database Field. -->
+		<!-- [13537] Spacer_chartsite_hr_d Field. Type: Spacer. A None Database Field. -->
 		<field type="spacer" name="spacer_chartsite_hr_d" hr="true" class="spacer_chartsite_hr_d" />		
-		<!-- [13538] Site_haxistextstylefontcolor Field. Type: Color. -->
+		<!-- [13539] Site_haxistextstylefontcolor Field. Type: Color. -->
 		<field
 			type="color"
 			name="site_haxistextstylefontcolor"
@@ -647,7 +647,7 @@
 			label="COM_COSTBENEFITPROJECTION_CONFIG_HAXISTEXTSTYLEFONTCOLOR_LABEL"
 			description="COM_COSTBENEFITPROJECTION_CONFIG_HAXISTEXTSTYLEFONTCOLOR_DESC"
 		/>		
-		<!-- [13546] Site_haxistitletextstylefontcolor Field. Type: Color. -->
+		<!-- [13547] Site_haxistitletextstylefontcolor Field. Type: Color. -->
 		<field
 			type="color"
 			name="site_haxistitletextstylefontcolor"
@@ -669,7 +669,7 @@
 			default=""
 		/>
 
-		<!-- [11374] Resultpath Field. Type: Text. (joomla) -->
+		<!-- [11375] Resultpath Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="resultpath"
diff --git a/admin/controller.php b/admin/controller.php
index 8e29a907..1101516c 100644
--- a/admin/controller.php
+++ b/admin/controller.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php
index d901158d..dfa9abaf 100644
--- a/admin/controllers/ajax.json.php
+++ b/admin/controllers/ajax.json.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/controllers/causerisk.php b/admin/controllers/causerisk.php
index 98de34f5..824b4ab5 100644
--- a/admin/controllers/causerisk.php
+++ b/admin/controllers/causerisk.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -54,13 +54,13 @@ class CostbenefitprojectionControllerCauserisk extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
-		// [9327] Access check.
+		// [9328] Access check.
 		$access = JFactory::getUser()->authorise('causerisk.access', 'com_costbenefitprojection');
 		if (!$access)
 		{
 			return false;
 		}
-		// [9338] In the absense of better information, revert to the component permissions.
+		// [9339] In the absense of better information, revert to the component permissions.
 		return JFactory::getUser()->authorise('causerisk.create', $this->option);
 	}
 
@@ -76,13 +76,13 @@ class CostbenefitprojectionControllerCauserisk extends JControllerForm
 	 */
 	protected function allowEdit($data = array(), $key = 'id')
 	{
-		// [9481] get user object.
+		// [9482] get user object.
 		$user		= JFactory::getUser();
-		// [9483] get record id.
+		// [9484] get record id.
 		$recordId	= (int) isset($data[$key]) ? $data[$key] : 0;
 
 
-		// [9490] Access check.
+		// [9491] Access check.
 		$access = ($user->authorise('causerisk.access', 'com_costbenefitprojection.causerisk.' . (int) $recordId) &&  $user->authorise('causerisk.access', 'com_costbenefitprojection'));
 		if (!$access)
 		{
@@ -91,17 +91,17 @@ class CostbenefitprojectionControllerCauserisk extends JControllerForm
 
 		if ($recordId)
 		{
-			// [9499] The record has been set. Check the record permissions.
+			// [9500] The record has been set. Check the record permissions.
 			$permission = $user->authorise('causerisk.edit', 'com_costbenefitprojection.causerisk.' . (int) $recordId);
 			if (!$permission && !is_null($permission))
 			{
 				if ($user->authorise('causerisk.edit.own', 'com_costbenefitprojection.causerisk.' . $recordId))
 				{
-					// [9521] Now test the owner is the user.
+					// [9522] Now test the owner is the user.
 					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
 					if (empty($ownerId))
 					{
-						// [9525] Need to do a lookup from the model.
+						// [9526] Need to do a lookup from the model.
 						$record = $this->getModel()->getItem($recordId);
 
 						if (empty($record))
@@ -111,7 +111,7 @@ class CostbenefitprojectionControllerCauserisk extends JControllerForm
 						$ownerId = $record->created_by;
 					}
 
-					// [9533] If the owner matches 'me' then allow.
+					// [9534] If the owner matches 'me' then allow.
 					if ($ownerId == $user->id)
 					{
 						if ($user->authorise('causerisk.edit.own', 'com_costbenefitprojection'))
@@ -123,7 +123,7 @@ class CostbenefitprojectionControllerCauserisk extends JControllerForm
 				return false;
 			}
 		}
-		// [9555] Since there is no permission, revert to the component permissions.
+		// [9556] Since there is no permission, revert to the component permissions.
 		return $user->authorise('causerisk.edit', $this->option);
 	}
 
diff --git a/admin/controllers/causesrisks.php b/admin/controllers/causesrisks.php
index 523888b8..b8d5e57e 100644
--- a/admin/controllers/causesrisks.php
+++ b/admin/controllers/causesrisks.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -42,29 +42,29 @@ class CostbenefitprojectionControllerCausesrisks extends JControllerAdmin
 
 	public function exportData()
 	{
-		// [7277] Check for request forgeries
+		// [7278] Check for request forgeries
 		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
-		// [7279] check if export is allowed for this user.
+		// [7280] check if export is allowed for this user.
 		$user = JFactory::getUser();
 		if ($user->authorise('causerisk.export', 'com_costbenefitprojection') && $user->authorise('core.export', 'com_costbenefitprojection'))
 		{
-			// [7283] Get the input
+			// [7284] Get the input
 			$input = JFactory::getApplication()->input;
 			$pks = $input->post->get('cid', array(), 'array');
-			// [7286] Sanitize the input
+			// [7287] Sanitize the input
 			JArrayHelper::toInteger($pks);
-			// [7288] Get the model
+			// [7289] Get the model
 			$model = $this->getModel('Causesrisks');
-			// [7290] get the data to export
+			// [7291] get the data to export
 			$data = $model->getExportData($pks);
 			if (CostbenefitprojectionHelper::checkArray($data))
 			{
-				// [7294] now set the data to the spreadsheet
+				// [7295] now set the data to the spreadsheet
 				$date = JFactory::getDate();
 				CostbenefitprojectionHelper::xls($data,'Causesrisks_'.$date->format('jS_F_Y'),'Causesrisks exported ('.$date->format('jS F, Y').')','causesrisks');
 			}
 		}
-		// [7299] Redirect to the list screen with error.
+		// [7300] Redirect to the list screen with error.
 		$message = JText::_('COM_COSTBENEFITPROJECTION_EXPORT_FAILED');
 		$this->setRedirect(JRoute::_('index.php?option=com_costbenefitprojection&view=causesrisks', false), $message, 'error');
 		return;
@@ -73,31 +73,31 @@ class CostbenefitprojectionControllerCausesrisks extends JControllerAdmin
 
 	public function importData()
 	{
-		// [7308] Check for request forgeries
+		// [7309] Check for request forgeries
 		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
-		// [7310] check if import is allowed for this user.
+		// [7311] check if import is allowed for this user.
 		$user = JFactory::getUser();
 		if ($user->authorise('causerisk.import', 'com_costbenefitprojection') && $user->authorise('core.import', 'com_costbenefitprojection'))
 		{
-			// [7314] Get the import model
+			// [7315] Get the import model
 			$model = $this->getModel('Causesrisks');
-			// [7316] get the headers to import
+			// [7317] get the headers to import
 			$headers = $model->getExImPortHeaders();
 			if (CostbenefitprojectionHelper::checkObject($headers))
 			{
-				// [7320] Load headers to session.
+				// [7321] Load headers to session.
 				$session = JFactory::getSession();
 				$headers = json_encode($headers);
 				$session->set('causerisk_VDM_IMPORTHEADERS', $headers);
 				$session->set('backto_VDM_IMPORT', 'causesrisks');
 				$session->set('dataType_VDM_IMPORTINTO', 'causerisk');
-				// [7326] Redirect to import view.
+				// [7327] Redirect to import view.
 				$message = JText::_('COM_COSTBENEFITPROJECTION_IMPORT_SELECT_FILE_FOR_CAUSESRISKS');
 				$this->setRedirect(JRoute::_('index.php?option=com_costbenefitprojection&view=import', false), $message);
 				return;
 			}
 		}
-		// [7338] Redirect to the list screen with error.
+		// [7339] Redirect to the list screen with error.
 		$message = JText::_('COM_COSTBENEFITPROJECTION_IMPORT_FAILED');
 		$this->setRedirect(JRoute::_('index.php?option=com_costbenefitprojection&view=causesrisks', false), $message, 'error');
 		return;
diff --git a/admin/controllers/combinedresults.php b/admin/controllers/combinedresults.php
index 448436c4..fde518ef 100644
--- a/admin/controllers/combinedresults.php
+++ b/admin/controllers/combinedresults.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/controllers/companies.php b/admin/controllers/companies.php
index 14a93a13..5312ebda 100644
--- a/admin/controllers/companies.php
+++ b/admin/controllers/companies.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -42,29 +42,29 @@ class CostbenefitprojectionControllerCompanies extends JControllerAdmin
 
 	public function exportData()
 	{
-		// [7277] Check for request forgeries
+		// [7278] Check for request forgeries
 		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
-		// [7279] check if export is allowed for this user.
+		// [7280] check if export is allowed for this user.
 		$user = JFactory::getUser();
 		if ($user->authorise('company.export', 'com_costbenefitprojection') && $user->authorise('core.export', 'com_costbenefitprojection'))
 		{
-			// [7283] Get the input
+			// [7284] Get the input
 			$input = JFactory::getApplication()->input;
 			$pks = $input->post->get('cid', array(), 'array');
-			// [7286] Sanitize the input
+			// [7287] Sanitize the input
 			JArrayHelper::toInteger($pks);
-			// [7288] Get the model
+			// [7289] Get the model
 			$model = $this->getModel('Companies');
-			// [7290] get the data to export
+			// [7291] get the data to export
 			$data = $model->getExportData($pks);
 			if (CostbenefitprojectionHelper::checkArray($data))
 			{
-				// [7294] now set the data to the spreadsheet
+				// [7295] now set the data to the spreadsheet
 				$date = JFactory::getDate();
 				CostbenefitprojectionHelper::xls($data,'Companies_'.$date->format('jS_F_Y'),'Companies exported ('.$date->format('jS F, Y').')','companies');
 			}
 		}
-		// [7299] Redirect to the list screen with error.
+		// [7300] Redirect to the list screen with error.
 		$message = JText::_('COM_COSTBENEFITPROJECTION_EXPORT_FAILED');
 		$this->setRedirect(JRoute::_('index.php?option=com_costbenefitprojection&view=companies', false), $message, 'error');
 		return;
@@ -73,31 +73,31 @@ class CostbenefitprojectionControllerCompanies extends JControllerAdmin
 
 	public function importData()
 	{
-		// [7308] Check for request forgeries
+		// [7309] Check for request forgeries
 		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
-		// [7310] check if import is allowed for this user.
+		// [7311] check if import is allowed for this user.
 		$user = JFactory::getUser();
 		if ($user->authorise('company.import', 'com_costbenefitprojection') && $user->authorise('core.import', 'com_costbenefitprojection'))
 		{
-			// [7314] Get the import model
+			// [7315] Get the import model
 			$model = $this->getModel('Companies');
-			// [7316] get the headers to import
+			// [7317] get the headers to import
 			$headers = $model->getExImPortHeaders();
 			if (CostbenefitprojectionHelper::checkObject($headers))
 			{
-				// [7320] Load headers to session.
+				// [7321] Load headers to session.
 				$session = JFactory::getSession();
 				$headers = json_encode($headers);
 				$session->set('company_VDM_IMPORTHEADERS', $headers);
 				$session->set('backto_VDM_IMPORT', 'companies');
 				$session->set('dataType_VDM_IMPORTINTO', 'company');
-				// [7326] Redirect to import view.
+				// [7327] Redirect to import view.
 				$message = JText::_('COM_COSTBENEFITPROJECTION_IMPORT_SELECT_FILE_FOR_COMPANIES');
 				$this->setRedirect(JRoute::_('index.php?option=com_costbenefitprojection&view=import', false), $message);
 				return;
 			}
 		}
-		// [7338] Redirect to the list screen with error.
+		// [7339] Redirect to the list screen with error.
 		$message = JText::_('COM_COSTBENEFITPROJECTION_IMPORT_FAILED');
 		$this->setRedirect(JRoute::_('index.php?option=com_costbenefitprojection&view=companies', false), $message, 'error');
 		return;
@@ -105,23 +105,23 @@ class CostbenefitprojectionControllerCompanies extends JControllerAdmin
 
 	public function redirectToCombinedresults()
 	{
-		// [7149] Check for request forgeries
+		// [7150] Check for request forgeries
 		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
-		// [7151] check if export is allowed for this user.
+		// [7152] check if export is allowed for this user.
 		$user = JFactory::getUser();
 		if ($user->authorise('combinedresults.access', 'com_costbenefitprojection'))
 		{
-			// [7155] Get the input
+			// [7156] Get the input
 			$input = JFactory::getApplication()->input;
 			$pks = $input->post->get('cid', array(), 'array');
-			// [7158] Sanitize the input
+			// [7159] Sanitize the input
 			JArrayHelper::toInteger($pks);
-			// [7160] convert to string
+			// [7161] convert to string
 			$ids = implode('_', $pks);
 			$this->setRedirect(JRoute::_('index.php?option=com_costbenefitprojection&view=combinedresults&cid='.$ids, false));
 			return;
 		}
-		// [7165] Redirect to the list screen with error.
+		// [7166] Redirect to the list screen with error.
 		$message = JText::_('COM_COSTBENEFITPROJECTION_ACCESS_TO_COMBINEDRESULTS_FAILED');
 		$this->setRedirect(JRoute::_('index.php?option=com_costbenefitprojection&view=companies', false), $message, 'error');
 		return;
diff --git a/admin/controllers/company.php b/admin/controllers/company.php
index 05d1e1ba..e09e4bdd 100644
--- a/admin/controllers/company.php
+++ b/admin/controllers/company.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -54,13 +54,13 @@ class CostbenefitprojectionControllerCompany extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
-		// [9327] Access check.
+		// [9328] Access check.
 		$access = JFactory::getUser()->authorise('company.access', 'com_costbenefitprojection');
 		if (!$access)
 		{
 			return false;
 		}
-		// [9338] In the absense of better information, revert to the component permissions.
+		// [9339] In the absense of better information, revert to the component permissions.
 		return JFactory::getUser()->authorise('company.create', $this->option);
 	}
 
@@ -76,9 +76,9 @@ class CostbenefitprojectionControllerCompany extends JControllerForm
 	 */
 	protected function allowEdit($data = array(), $key = 'id')
 	{
-		// [9481] get user object.
+		// [9482] get user object.
 		$user		= JFactory::getUser();
-		// [9483] get record id.
+		// [9484] get record id.
 		$recordId	= (int) isset($data[$key]) ? $data[$key] : 0;
 		if (!$user->authorise('core.options', 'com_costbenefitprojection'))
 		{
@@ -97,7 +97,7 @@ class CostbenefitprojectionControllerCompany extends JControllerForm
 			return false;
 		}
 
-		// [9490] Access check.
+		// [9491] Access check.
 		$access = ($user->authorise('company.access', 'com_costbenefitprojection.company.' . (int) $recordId) &&  $user->authorise('company.access', 'com_costbenefitprojection'));
 		if (!$access)
 		{
@@ -106,17 +106,17 @@ class CostbenefitprojectionControllerCompany extends JControllerForm
 
 		if ($recordId)
 		{
-			// [9499] The record has been set. Check the record permissions.
+			// [9500] The record has been set. Check the record permissions.
 			$permission = $user->authorise('company.edit', 'com_costbenefitprojection.company.' . (int) $recordId);
 			if (!$permission && !is_null($permission))
 			{
 				if ($user->authorise('company.edit.own', 'com_costbenefitprojection.company.' . $recordId))
 				{
-					// [9521] Now test the owner is the user.
+					// [9522] Now test the owner is the user.
 					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
 					if (empty($ownerId))
 					{
-						// [9525] Need to do a lookup from the model.
+						// [9526] Need to do a lookup from the model.
 						$record = $this->getModel()->getItem($recordId);
 
 						if (empty($record))
@@ -126,7 +126,7 @@ class CostbenefitprojectionControllerCompany extends JControllerForm
 						$ownerId = $record->created_by;
 					}
 
-					// [9533] If the owner matches 'me' then allow.
+					// [9534] If the owner matches 'me' then allow.
 					if ($ownerId == $user->id)
 					{
 						if ($user->authorise('company.edit.own', 'com_costbenefitprojection'))
@@ -138,7 +138,7 @@ class CostbenefitprojectionControllerCompany extends JControllerForm
 				return false;
 			}
 		}
-		// [9555] Since there is no permission, revert to the component permissions.
+		// [9556] Since there is no permission, revert to the component permissions.
 		return $user->authorise('company.edit', $this->option);
 	}
 
diff --git a/admin/controllers/companyresults.php b/admin/controllers/companyresults.php
index 8ad715d3..e9b034bb 100644
--- a/admin/controllers/companyresults.php
+++ b/admin/controllers/companyresults.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/controllers/costbenefitprojection.php b/admin/controllers/costbenefitprojection.php
index 0158ef29..0dce4b11 100644
--- a/admin/controllers/costbenefitprojection.php
+++ b/admin/controllers/costbenefitprojection.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/controllers/countries.php b/admin/controllers/countries.php
index 47c54175..8c0206b7 100644
--- a/admin/controllers/countries.php
+++ b/admin/controllers/countries.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -42,29 +42,29 @@ class CostbenefitprojectionControllerCountries extends JControllerAdmin
 
 	public function exportData()
 	{
-		// [7277] Check for request forgeries
+		// [7278] Check for request forgeries
 		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
-		// [7279] check if export is allowed for this user.
+		// [7280] check if export is allowed for this user.
 		$user = JFactory::getUser();
 		if ($user->authorise('country.export', 'com_costbenefitprojection') && $user->authorise('core.export', 'com_costbenefitprojection'))
 		{
-			// [7283] Get the input
+			// [7284] Get the input
 			$input = JFactory::getApplication()->input;
 			$pks = $input->post->get('cid', array(), 'array');
-			// [7286] Sanitize the input
+			// [7287] Sanitize the input
 			JArrayHelper::toInteger($pks);
-			// [7288] Get the model
+			// [7289] Get the model
 			$model = $this->getModel('Countries');
-			// [7290] get the data to export
+			// [7291] get the data to export
 			$data = $model->getExportData($pks);
 			if (CostbenefitprojectionHelper::checkArray($data))
 			{
-				// [7294] now set the data to the spreadsheet
+				// [7295] now set the data to the spreadsheet
 				$date = JFactory::getDate();
 				CostbenefitprojectionHelper::xls($data,'Countries_'.$date->format('jS_F_Y'),'Countries exported ('.$date->format('jS F, Y').')','countries');
 			}
 		}
-		// [7299] Redirect to the list screen with error.
+		// [7300] Redirect to the list screen with error.
 		$message = JText::_('COM_COSTBENEFITPROJECTION_EXPORT_FAILED');
 		$this->setRedirect(JRoute::_('index.php?option=com_costbenefitprojection&view=countries', false), $message, 'error');
 		return;
@@ -73,31 +73,31 @@ class CostbenefitprojectionControllerCountries extends JControllerAdmin
 
 	public function importData()
 	{
-		// [7308] Check for request forgeries
+		// [7309] Check for request forgeries
 		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
-		// [7310] check if import is allowed for this user.
+		// [7311] check if import is allowed for this user.
 		$user = JFactory::getUser();
 		if ($user->authorise('country.import', 'com_costbenefitprojection') && $user->authorise('core.import', 'com_costbenefitprojection'))
 		{
-			// [7314] Get the import model
+			// [7315] Get the import model
 			$model = $this->getModel('Countries');
-			// [7316] get the headers to import
+			// [7317] get the headers to import
 			$headers = $model->getExImPortHeaders();
 			if (CostbenefitprojectionHelper::checkObject($headers))
 			{
-				// [7320] Load headers to session.
+				// [7321] Load headers to session.
 				$session = JFactory::getSession();
 				$headers = json_encode($headers);
 				$session->set('country_VDM_IMPORTHEADERS', $headers);
 				$session->set('backto_VDM_IMPORT', 'countries');
 				$session->set('dataType_VDM_IMPORTINTO', 'country');
-				// [7326] Redirect to import view.
+				// [7327] Redirect to import view.
 				$message = JText::_('COM_COSTBENEFITPROJECTION_IMPORT_SELECT_FILE_FOR_COUNTRIES');
 				$this->setRedirect(JRoute::_('index.php?option=com_costbenefitprojection&view=import', false), $message);
 				return;
 			}
 		}
-		// [7338] Redirect to the list screen with error.
+		// [7339] Redirect to the list screen with error.
 		$message = JText::_('COM_COSTBENEFITPROJECTION_IMPORT_FAILED');
 		$this->setRedirect(JRoute::_('index.php?option=com_costbenefitprojection&view=countries', false), $message, 'error');
 		return;
diff --git a/admin/controllers/country.php b/admin/controllers/country.php
index ff9cdb4a..93eef5fd 100644
--- a/admin/controllers/country.php
+++ b/admin/controllers/country.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -54,13 +54,13 @@ class CostbenefitprojectionControllerCountry extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
-		// [9327] Access check.
+		// [9328] Access check.
 		$access = JFactory::getUser()->authorise('country.access', 'com_costbenefitprojection');
 		if (!$access)
 		{
 			return false;
 		}
-		// [9338] In the absense of better information, revert to the component permissions.
+		// [9339] In the absense of better information, revert to the component permissions.
 		return JFactory::getUser()->authorise('country.create', $this->option);
 	}
 
@@ -76,9 +76,9 @@ class CostbenefitprojectionControllerCountry extends JControllerForm
 	 */
 	protected function allowEdit($data = array(), $key = 'id')
 	{
-		// [9481] get user object.
+		// [9482] get user object.
 		$user		= JFactory::getUser();
-		// [9483] get record id.
+		// [9484] get record id.
 		$recordId	= (int) isset($data[$key]) ? $data[$key] : 0;
 		if (!$user->authorise('core.options', 'com_costbenefitprojection'))
 		{
@@ -91,7 +91,7 @@ class CostbenefitprojectionControllerCountry extends JControllerForm
 			}
 		}
 
-		// [9490] Access check.
+		// [9491] Access check.
 		$access = ($user->authorise('country.access', 'com_costbenefitprojection.country.' . (int) $recordId) &&  $user->authorise('country.access', 'com_costbenefitprojection'));
 		if (!$access)
 		{
@@ -100,17 +100,17 @@ class CostbenefitprojectionControllerCountry extends JControllerForm
 
 		if ($recordId)
 		{
-			// [9499] The record has been set. Check the record permissions.
+			// [9500] The record has been set. Check the record permissions.
 			$permission = $user->authorise('country.edit', 'com_costbenefitprojection.country.' . (int) $recordId);
 			if (!$permission && !is_null($permission))
 			{
 				if ($user->authorise('country.edit.own', 'com_costbenefitprojection.country.' . $recordId))
 				{
-					// [9521] Now test the owner is the user.
+					// [9522] Now test the owner is the user.
 					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
 					if (empty($ownerId))
 					{
-						// [9525] Need to do a lookup from the model.
+						// [9526] Need to do a lookup from the model.
 						$record = $this->getModel()->getItem($recordId);
 
 						if (empty($record))
@@ -120,7 +120,7 @@ class CostbenefitprojectionControllerCountry extends JControllerForm
 						$ownerId = $record->created_by;
 					}
 
-					// [9533] If the owner matches 'me' then allow.
+					// [9534] If the owner matches 'me' then allow.
 					if ($ownerId == $user->id)
 					{
 						if ($user->authorise('country.edit.own', 'com_costbenefitprojection'))
@@ -132,7 +132,7 @@ class CostbenefitprojectionControllerCountry extends JControllerForm
 				return false;
 			}
 		}
-		// [9555] Since there is no permission, revert to the component permissions.
+		// [9556] Since there is no permission, revert to the component permissions.
 		return $user->authorise('country.edit', $this->option);
 	}
 
diff --git a/admin/controllers/currencies.php b/admin/controllers/currencies.php
index 997e60de..8d84a12b 100644
--- a/admin/controllers/currencies.php
+++ b/admin/controllers/currencies.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -42,29 +42,29 @@ class CostbenefitprojectionControllerCurrencies extends JControllerAdmin
 
 	public function exportData()
 	{
-		// [7277] Check for request forgeries
+		// [7278] Check for request forgeries
 		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
-		// [7279] check if export is allowed for this user.
+		// [7280] check if export is allowed for this user.
 		$user = JFactory::getUser();
 		if ($user->authorise('currency.export', 'com_costbenefitprojection') && $user->authorise('core.export', 'com_costbenefitprojection'))
 		{
-			// [7283] Get the input
+			// [7284] Get the input
 			$input = JFactory::getApplication()->input;
 			$pks = $input->post->get('cid', array(), 'array');
-			// [7286] Sanitize the input
+			// [7287] Sanitize the input
 			JArrayHelper::toInteger($pks);
-			// [7288] Get the model
+			// [7289] Get the model
 			$model = $this->getModel('Currencies');
-			// [7290] get the data to export
+			// [7291] get the data to export
 			$data = $model->getExportData($pks);
 			if (CostbenefitprojectionHelper::checkArray($data))
 			{
-				// [7294] now set the data to the spreadsheet
+				// [7295] now set the data to the spreadsheet
 				$date = JFactory::getDate();
 				CostbenefitprojectionHelper::xls($data,'Currencies_'.$date->format('jS_F_Y'),'Currencies exported ('.$date->format('jS F, Y').')','currencies');
 			}
 		}
-		// [7299] Redirect to the list screen with error.
+		// [7300] Redirect to the list screen with error.
 		$message = JText::_('COM_COSTBENEFITPROJECTION_EXPORT_FAILED');
 		$this->setRedirect(JRoute::_('index.php?option=com_costbenefitprojection&view=currencies', false), $message, 'error');
 		return;
@@ -73,31 +73,31 @@ class CostbenefitprojectionControllerCurrencies extends JControllerAdmin
 
 	public function importData()
 	{
-		// [7308] Check for request forgeries
+		// [7309] Check for request forgeries
 		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
-		// [7310] check if import is allowed for this user.
+		// [7311] check if import is allowed for this user.
 		$user = JFactory::getUser();
 		if ($user->authorise('currency.import', 'com_costbenefitprojection') && $user->authorise('core.import', 'com_costbenefitprojection'))
 		{
-			// [7314] Get the import model
+			// [7315] Get the import model
 			$model = $this->getModel('Currencies');
-			// [7316] get the headers to import
+			// [7317] get the headers to import
 			$headers = $model->getExImPortHeaders();
 			if (CostbenefitprojectionHelper::checkObject($headers))
 			{
-				// [7320] Load headers to session.
+				// [7321] Load headers to session.
 				$session = JFactory::getSession();
 				$headers = json_encode($headers);
 				$session->set('currency_VDM_IMPORTHEADERS', $headers);
 				$session->set('backto_VDM_IMPORT', 'currencies');
 				$session->set('dataType_VDM_IMPORTINTO', 'currency');
-				// [7326] Redirect to import view.
+				// [7327] Redirect to import view.
 				$message = JText::_('COM_COSTBENEFITPROJECTION_IMPORT_SELECT_FILE_FOR_CURRENCIES');
 				$this->setRedirect(JRoute::_('index.php?option=com_costbenefitprojection&view=import', false), $message);
 				return;
 			}
 		}
-		// [7338] Redirect to the list screen with error.
+		// [7339] Redirect to the list screen with error.
 		$message = JText::_('COM_COSTBENEFITPROJECTION_IMPORT_FAILED');
 		$this->setRedirect(JRoute::_('index.php?option=com_costbenefitprojection&view=currencies', false), $message, 'error');
 		return;
diff --git a/admin/controllers/currency.php b/admin/controllers/currency.php
index 762a8765..1da5c3ba 100644
--- a/admin/controllers/currency.php
+++ b/admin/controllers/currency.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -54,13 +54,13 @@ class CostbenefitprojectionControllerCurrency extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
-		// [9327] Access check.
+		// [9328] Access check.
 		$access = JFactory::getUser()->authorise('currency.access', 'com_costbenefitprojection');
 		if (!$access)
 		{
 			return false;
 		}
-		// [9338] In the absense of better information, revert to the component permissions.
+		// [9339] In the absense of better information, revert to the component permissions.
 		return JFactory::getUser()->authorise('currency.create', $this->option);
 	}
 
@@ -76,13 +76,13 @@ class CostbenefitprojectionControllerCurrency extends JControllerForm
 	 */
 	protected function allowEdit($data = array(), $key = 'id')
 	{
-		// [9481] get user object.
+		// [9482] get user object.
 		$user		= JFactory::getUser();
-		// [9483] get record id.
+		// [9484] get record id.
 		$recordId	= (int) isset($data[$key]) ? $data[$key] : 0;
 
 
-		// [9490] Access check.
+		// [9491] Access check.
 		$access = ($user->authorise('currency.access', 'com_costbenefitprojection.currency.' . (int) $recordId) &&  $user->authorise('currency.access', 'com_costbenefitprojection'));
 		if (!$access)
 		{
@@ -91,17 +91,17 @@ class CostbenefitprojectionControllerCurrency extends JControllerForm
 
 		if ($recordId)
 		{
-			// [9499] The record has been set. Check the record permissions.
+			// [9500] The record has been set. Check the record permissions.
 			$permission = $user->authorise('currency.edit', 'com_costbenefitprojection.currency.' . (int) $recordId);
 			if (!$permission && !is_null($permission))
 			{
 				if ($user->authorise('currency.edit.own', 'com_costbenefitprojection.currency.' . $recordId))
 				{
-					// [9521] Now test the owner is the user.
+					// [9522] Now test the owner is the user.
 					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
 					if (empty($ownerId))
 					{
-						// [9525] Need to do a lookup from the model.
+						// [9526] Need to do a lookup from the model.
 						$record = $this->getModel()->getItem($recordId);
 
 						if (empty($record))
@@ -111,7 +111,7 @@ class CostbenefitprojectionControllerCurrency extends JControllerForm
 						$ownerId = $record->created_by;
 					}
 
-					// [9533] If the owner matches 'me' then allow.
+					// [9534] If the owner matches 'me' then allow.
 					if ($ownerId == $user->id)
 					{
 						if ($user->authorise('currency.edit.own', 'com_costbenefitprojection'))
@@ -123,7 +123,7 @@ class CostbenefitprojectionControllerCurrency extends JControllerForm
 				return false;
 			}
 		}
-		// [9555] Since there is no permission, revert to the component permissions.
+		// [9556] Since there is no permission, revert to the component permissions.
 		return $user->authorise('currency.edit', $this->option);
 	}
 
diff --git a/admin/controllers/health_data.php b/admin/controllers/health_data.php
index 54f11446..7931d8e7 100644
--- a/admin/controllers/health_data.php
+++ b/admin/controllers/health_data.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -54,13 +54,13 @@ class CostbenefitprojectionControllerHealth_data extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
-		// [9327] Access check.
+		// [9328] Access check.
 		$access = JFactory::getUser()->authorise('health_data.access', 'com_costbenefitprojection');
 		if (!$access)
 		{
 			return false;
 		}
-		// [9338] In the absense of better information, revert to the component permissions.
+		// [9339] In the absense of better information, revert to the component permissions.
 		return JFactory::getUser()->authorise('health_data.create', $this->option);
 	}
 
@@ -76,9 +76,9 @@ class CostbenefitprojectionControllerHealth_data extends JControllerForm
 	 */
 	protected function allowEdit($data = array(), $key = 'id')
 	{
-		// [9481] get user object.
+		// [9482] get user object.
 		$user		= JFactory::getUser();
-		// [9483] get record id.
+		// [9484] get record id.
 		$recordId	= (int) isset($data[$key]) ? $data[$key] : 0;
 		if (!$user->authorise('core.options', 'com_costbenefitprojection'))
 		{
@@ -92,7 +92,7 @@ class CostbenefitprojectionControllerHealth_data extends JControllerForm
 			}
 		}
 
-		// [9490] Access check.
+		// [9491] Access check.
 		$access = ($user->authorise('health_data.access', 'com_costbenefitprojection.health_data.' . (int) $recordId) &&  $user->authorise('health_data.access', 'com_costbenefitprojection'));
 		if (!$access)
 		{
@@ -101,17 +101,17 @@ class CostbenefitprojectionControllerHealth_data extends JControllerForm
 
 		if ($recordId)
 		{
-			// [9499] The record has been set. Check the record permissions.
+			// [9500] The record has been set. Check the record permissions.
 			$permission = $user->authorise('health_data.edit', 'com_costbenefitprojection.health_data.' . (int) $recordId);
 			if (!$permission && !is_null($permission))
 			{
 				if ($user->authorise('health_data.edit.own', 'com_costbenefitprojection.health_data.' . $recordId))
 				{
-					// [9521] Now test the owner is the user.
+					// [9522] Now test the owner is the user.
 					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
 					if (empty($ownerId))
 					{
-						// [9525] Need to do a lookup from the model.
+						// [9526] Need to do a lookup from the model.
 						$record = $this->getModel()->getItem($recordId);
 
 						if (empty($record))
@@ -121,7 +121,7 @@ class CostbenefitprojectionControllerHealth_data extends JControllerForm
 						$ownerId = $record->created_by;
 					}
 
-					// [9533] If the owner matches 'me' then allow.
+					// [9534] If the owner matches 'me' then allow.
 					if ($ownerId == $user->id)
 					{
 						if ($user->authorise('health_data.edit.own', 'com_costbenefitprojection'))
@@ -133,7 +133,7 @@ class CostbenefitprojectionControllerHealth_data extends JControllerForm
 				return false;
 			}
 		}
-		// [9555] Since there is no permission, revert to the component permissions.
+		// [9556] Since there is no permission, revert to the component permissions.
 		return $user->authorise('health_data.edit', $this->option);
 	}
 
diff --git a/admin/controllers/health_data_sets.php b/admin/controllers/health_data_sets.php
index 7da1a179..866be8ba 100644
--- a/admin/controllers/health_data_sets.php
+++ b/admin/controllers/health_data_sets.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -42,29 +42,29 @@ class CostbenefitprojectionControllerHealth_data_sets extends JControllerAdmin
 
 	public function exportData()
 	{
-		// [7277] Check for request forgeries
+		// [7278] Check for request forgeries
 		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
-		// [7279] check if export is allowed for this user.
+		// [7280] check if export is allowed for this user.
 		$user = JFactory::getUser();
 		if ($user->authorise('health_data.export', 'com_costbenefitprojection') && $user->authorise('core.export', 'com_costbenefitprojection'))
 		{
-			// [7283] Get the input
+			// [7284] Get the input
 			$input = JFactory::getApplication()->input;
 			$pks = $input->post->get('cid', array(), 'array');
-			// [7286] Sanitize the input
+			// [7287] Sanitize the input
 			JArrayHelper::toInteger($pks);
-			// [7288] Get the model
+			// [7289] Get the model
 			$model = $this->getModel('Health_data_sets');
-			// [7290] get the data to export
+			// [7291] get the data to export
 			$data = $model->getExportData($pks);
 			if (CostbenefitprojectionHelper::checkArray($data))
 			{
-				// [7294] now set the data to the spreadsheet
+				// [7295] now set the data to the spreadsheet
 				$date = JFactory::getDate();
 				CostbenefitprojectionHelper::xls($data,'Health_data_sets_'.$date->format('jS_F_Y'),'Health data sets exported ('.$date->format('jS F, Y').')','health data sets');
 			}
 		}
-		// [7299] Redirect to the list screen with error.
+		// [7300] Redirect to the list screen with error.
 		$message = JText::_('COM_COSTBENEFITPROJECTION_EXPORT_FAILED');
 		$this->setRedirect(JRoute::_('index.php?option=com_costbenefitprojection&view=health_data_sets', false), $message, 'error');
 		return;
@@ -73,31 +73,31 @@ class CostbenefitprojectionControllerHealth_data_sets extends JControllerAdmin
 
 	public function importData()
 	{
-		// [7308] Check for request forgeries
+		// [7309] Check for request forgeries
 		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
-		// [7310] check if import is allowed for this user.
+		// [7311] check if import is allowed for this user.
 		$user = JFactory::getUser();
 		if ($user->authorise('health_data.import', 'com_costbenefitprojection') && $user->authorise('core.import', 'com_costbenefitprojection'))
 		{
-			// [7314] Get the import model
+			// [7315] Get the import model
 			$model = $this->getModel('Health_data_sets');
-			// [7316] get the headers to import
+			// [7317] get the headers to import
 			$headers = $model->getExImPortHeaders();
 			if (CostbenefitprojectionHelper::checkObject($headers))
 			{
-				// [7320] Load headers to session.
+				// [7321] Load headers to session.
 				$session = JFactory::getSession();
 				$headers = json_encode($headers);
 				$session->set('health_data_VDM_IMPORTHEADERS', $headers);
 				$session->set('backto_VDM_IMPORT', 'health_data_sets');
 				$session->set('dataType_VDM_IMPORTINTO', 'health_data');
-				// [7326] Redirect to import view.
+				// [7327] Redirect to import view.
 				$message = JText::_('COM_COSTBENEFITPROJECTION_IMPORT_SELECT_FILE_FOR_HEALTH_DATA_SETS');
 				$this->setRedirect(JRoute::_('index.php?option=com_costbenefitprojection&view=import', false), $message);
 				return;
 			}
 		}
-		// [7338] Redirect to the list screen with error.
+		// [7339] Redirect to the list screen with error.
 		$message = JText::_('COM_COSTBENEFITPROJECTION_IMPORT_FAILED');
 		$this->setRedirect(JRoute::_('index.php?option=com_costbenefitprojection&view=health_data_sets', false), $message, 'error');
 		return;
diff --git a/admin/controllers/help.php b/admin/controllers/help.php
index 6afaa0cc..8350eea4 100644
--- a/admin/controllers/help.php
+++ b/admin/controllers/help.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/controllers/help_document.php b/admin/controllers/help_document.php
index aac0517a..6c157b19 100644
--- a/admin/controllers/help_document.php
+++ b/admin/controllers/help_document.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -54,13 +54,13 @@ class CostbenefitprojectionControllerHelp_document extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
-		// [9327] Access check.
+		// [9328] Access check.
 		$access = JFactory::getUser()->authorise('help_document.access', 'com_costbenefitprojection');
 		if (!$access)
 		{
 			return false;
 		}
-		// [9338] In the absense of better information, revert to the component permissions.
+		// [9339] In the absense of better information, revert to the component permissions.
 		return JFactory::getUser()->authorise('help_document.create', $this->option);
 	}
 
@@ -76,13 +76,13 @@ class CostbenefitprojectionControllerHelp_document extends JControllerForm
 	 */
 	protected function allowEdit($data = array(), $key = 'id')
 	{
-		// [9481] get user object.
+		// [9482] get user object.
 		$user		= JFactory::getUser();
-		// [9483] get record id.
+		// [9484] get record id.
 		$recordId	= (int) isset($data[$key]) ? $data[$key] : 0;
 
 
-		// [9490] Access check.
+		// [9491] Access check.
 		$access = ($user->authorise('help_document.access', 'com_costbenefitprojection.help_document.' . (int) $recordId) &&  $user->authorise('help_document.access', 'com_costbenefitprojection'));
 		if (!$access)
 		{
@@ -91,17 +91,17 @@ class CostbenefitprojectionControllerHelp_document extends JControllerForm
 
 		if ($recordId)
 		{
-			// [9499] The record has been set. Check the record permissions.
+			// [9500] The record has been set. Check the record permissions.
 			$permission = $user->authorise('help_document.edit', 'com_costbenefitprojection.help_document.' . (int) $recordId);
 			if (!$permission && !is_null($permission))
 			{
 				if ($user->authorise('help_document.edit.own', 'com_costbenefitprojection.help_document.' . $recordId))
 				{
-					// [9521] Now test the owner is the user.
+					// [9522] Now test the owner is the user.
 					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
 					if (empty($ownerId))
 					{
-						// [9525] Need to do a lookup from the model.
+						// [9526] Need to do a lookup from the model.
 						$record = $this->getModel()->getItem($recordId);
 
 						if (empty($record))
@@ -111,7 +111,7 @@ class CostbenefitprojectionControllerHelp_document extends JControllerForm
 						$ownerId = $record->created_by;
 					}
 
-					// [9533] If the owner matches 'me' then allow.
+					// [9534] If the owner matches 'me' then allow.
 					if ($ownerId == $user->id)
 					{
 						if ($user->authorise('help_document.edit.own', 'com_costbenefitprojection'))
@@ -123,7 +123,7 @@ class CostbenefitprojectionControllerHelp_document extends JControllerForm
 				return false;
 			}
 		}
-		// [9555] Since there is no permission, revert to the component permissions.
+		// [9556] Since there is no permission, revert to the component permissions.
 		return $user->authorise('help_document.edit', $this->option);
 	}
 
diff --git a/admin/controllers/help_documents.php b/admin/controllers/help_documents.php
index 29126dfe..6a600075 100644
--- a/admin/controllers/help_documents.php
+++ b/admin/controllers/help_documents.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -42,29 +42,29 @@ class CostbenefitprojectionControllerHelp_documents extends JControllerAdmin
 
 	public function exportData()
 	{
-		// [7277] Check for request forgeries
+		// [7278] Check for request forgeries
 		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
-		// [7279] check if export is allowed for this user.
+		// [7280] check if export is allowed for this user.
 		$user = JFactory::getUser();
 		if ($user->authorise('help_document.export', 'com_costbenefitprojection') && $user->authorise('core.export', 'com_costbenefitprojection'))
 		{
-			// [7283] Get the input
+			// [7284] Get the input
 			$input = JFactory::getApplication()->input;
 			$pks = $input->post->get('cid', array(), 'array');
-			// [7286] Sanitize the input
+			// [7287] Sanitize the input
 			JArrayHelper::toInteger($pks);
-			// [7288] Get the model
+			// [7289] Get the model
 			$model = $this->getModel('Help_documents');
-			// [7290] get the data to export
+			// [7291] get the data to export
 			$data = $model->getExportData($pks);
 			if (CostbenefitprojectionHelper::checkArray($data))
 			{
-				// [7294] now set the data to the spreadsheet
+				// [7295] now set the data to the spreadsheet
 				$date = JFactory::getDate();
 				CostbenefitprojectionHelper::xls($data,'Help_documents_'.$date->format('jS_F_Y'),'Help documents exported ('.$date->format('jS F, Y').')','help documents');
 			}
 		}
-		// [7299] Redirect to the list screen with error.
+		// [7300] Redirect to the list screen with error.
 		$message = JText::_('COM_COSTBENEFITPROJECTION_EXPORT_FAILED');
 		$this->setRedirect(JRoute::_('index.php?option=com_costbenefitprojection&view=help_documents', false), $message, 'error');
 		return;
@@ -73,31 +73,31 @@ class CostbenefitprojectionControllerHelp_documents extends JControllerAdmin
 
 	public function importData()
 	{
-		// [7308] Check for request forgeries
+		// [7309] Check for request forgeries
 		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
-		// [7310] check if import is allowed for this user.
+		// [7311] check if import is allowed for this user.
 		$user = JFactory::getUser();
 		if ($user->authorise('help_document.import', 'com_costbenefitprojection') && $user->authorise('core.import', 'com_costbenefitprojection'))
 		{
-			// [7314] Get the import model
+			// [7315] Get the import model
 			$model = $this->getModel('Help_documents');
-			// [7316] get the headers to import
+			// [7317] get the headers to import
 			$headers = $model->getExImPortHeaders();
 			if (CostbenefitprojectionHelper::checkObject($headers))
 			{
-				// [7320] Load headers to session.
+				// [7321] Load headers to session.
 				$session = JFactory::getSession();
 				$headers = json_encode($headers);
 				$session->set('help_document_VDM_IMPORTHEADERS', $headers);
 				$session->set('backto_VDM_IMPORT', 'help_documents');
 				$session->set('dataType_VDM_IMPORTINTO', 'help_document');
-				// [7326] Redirect to import view.
+				// [7327] Redirect to import view.
 				$message = JText::_('COM_COSTBENEFITPROJECTION_IMPORT_SELECT_FILE_FOR_HELP_DOCUMENTS');
 				$this->setRedirect(JRoute::_('index.php?option=com_costbenefitprojection&view=import', false), $message);
 				return;
 			}
 		}
-		// [7338] Redirect to the list screen with error.
+		// [7339] Redirect to the list screen with error.
 		$message = JText::_('COM_COSTBENEFITPROJECTION_IMPORT_FAILED');
 		$this->setRedirect(JRoute::_('index.php?option=com_costbenefitprojection&view=help_documents', false), $message, 'error');
 		return;
diff --git a/admin/controllers/import.php b/admin/controllers/import.php
index 67630ba6..19df1781 100644
--- a/admin/controllers/import.php
+++ b/admin/controllers/import.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/controllers/intervention.php b/admin/controllers/intervention.php
index 167443b0..2b032f9b 100644
--- a/admin/controllers/intervention.php
+++ b/admin/controllers/intervention.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -54,13 +54,13 @@ class CostbenefitprojectionControllerIntervention extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
-		// [9327] Access check.
+		// [9328] Access check.
 		$access = JFactory::getUser()->authorise('intervention.access', 'com_costbenefitprojection');
 		if (!$access)
 		{
 			return false;
 		}
-		// [9338] In the absense of better information, revert to the component permissions.
+		// [9339] In the absense of better information, revert to the component permissions.
 		return JFactory::getUser()->authorise('intervention.create', $this->option);
 	}
 
@@ -76,9 +76,9 @@ class CostbenefitprojectionControllerIntervention extends JControllerForm
 	 */
 	protected function allowEdit($data = array(), $key = 'id')
 	{
-		// [9481] get user object.
+		// [9482] get user object.
 		$user		= JFactory::getUser();
-		// [9483] get record id.
+		// [9484] get record id.
 		$recordId	= (int) isset($data[$key]) ? $data[$key] : 0;
 		// get company id
 		$company = CostbenefitprojectionHelper::getId('intervention',$recordId,'id','company');
@@ -97,7 +97,7 @@ class CostbenefitprojectionControllerIntervention extends JControllerForm
 			return false;
 		}
 
-		// [9490] Access check.
+		// [9491] Access check.
 		$access = ($user->authorise('intervention.access', 'com_costbenefitprojection.intervention.' . (int) $recordId) &&  $user->authorise('intervention.access', 'com_costbenefitprojection'));
 		if (!$access)
 		{
@@ -106,17 +106,17 @@ class CostbenefitprojectionControllerIntervention extends JControllerForm
 
 		if ($recordId)
 		{
-			// [9499] The record has been set. Check the record permissions.
+			// [9500] The record has been set. Check the record permissions.
 			$permission = $user->authorise('intervention.edit', 'com_costbenefitprojection.intervention.' . (int) $recordId);
 			if (!$permission && !is_null($permission))
 			{
 				if ($user->authorise('intervention.edit.own', 'com_costbenefitprojection.intervention.' . $recordId))
 				{
-					// [9521] Now test the owner is the user.
+					// [9522] Now test the owner is the user.
 					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
 					if (empty($ownerId))
 					{
-						// [9525] Need to do a lookup from the model.
+						// [9526] Need to do a lookup from the model.
 						$record = $this->getModel()->getItem($recordId);
 
 						if (empty($record))
@@ -126,7 +126,7 @@ class CostbenefitprojectionControllerIntervention extends JControllerForm
 						$ownerId = $record->created_by;
 					}
 
-					// [9533] If the owner matches 'me' then allow.
+					// [9534] If the owner matches 'me' then allow.
 					if ($ownerId == $user->id)
 					{
 						if ($user->authorise('intervention.edit.own', 'com_costbenefitprojection'))
@@ -138,7 +138,7 @@ class CostbenefitprojectionControllerIntervention extends JControllerForm
 				return false;
 			}
 		}
-		// [9555] Since there is no permission, revert to the component permissions.
+		// [9556] Since there is no permission, revert to the component permissions.
 		return $user->authorise('intervention.edit', $this->option);
 	}
 
diff --git a/admin/controllers/interventions.php b/admin/controllers/interventions.php
index fa086379..1f4c2fab 100644
--- a/admin/controllers/interventions.php
+++ b/admin/controllers/interventions.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -42,29 +42,29 @@ class CostbenefitprojectionControllerInterventions extends JControllerAdmin
 
 	public function exportData()
 	{
-		// [7277] Check for request forgeries
+		// [7278] Check for request forgeries
 		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
-		// [7279] check if export is allowed for this user.
+		// [7280] check if export is allowed for this user.
 		$user = JFactory::getUser();
 		if ($user->authorise('intervention.export', 'com_costbenefitprojection') && $user->authorise('core.export', 'com_costbenefitprojection'))
 		{
-			// [7283] Get the input
+			// [7284] Get the input
 			$input = JFactory::getApplication()->input;
 			$pks = $input->post->get('cid', array(), 'array');
-			// [7286] Sanitize the input
+			// [7287] Sanitize the input
 			JArrayHelper::toInteger($pks);
-			// [7288] Get the model
+			// [7289] Get the model
 			$model = $this->getModel('Interventions');
-			// [7290] get the data to export
+			// [7291] get the data to export
 			$data = $model->getExportData($pks);
 			if (CostbenefitprojectionHelper::checkArray($data))
 			{
-				// [7294] now set the data to the spreadsheet
+				// [7295] now set the data to the spreadsheet
 				$date = JFactory::getDate();
 				CostbenefitprojectionHelper::xls($data,'Interventions_'.$date->format('jS_F_Y'),'Interventions exported ('.$date->format('jS F, Y').')','interventions');
 			}
 		}
-		// [7299] Redirect to the list screen with error.
+		// [7300] Redirect to the list screen with error.
 		$message = JText::_('COM_COSTBENEFITPROJECTION_EXPORT_FAILED');
 		$this->setRedirect(JRoute::_('index.php?option=com_costbenefitprojection&view=interventions', false), $message, 'error');
 		return;
@@ -73,31 +73,31 @@ class CostbenefitprojectionControllerInterventions extends JControllerAdmin
 
 	public function importData()
 	{
-		// [7308] Check for request forgeries
+		// [7309] Check for request forgeries
 		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
-		// [7310] check if import is allowed for this user.
+		// [7311] check if import is allowed for this user.
 		$user = JFactory::getUser();
 		if ($user->authorise('intervention.import', 'com_costbenefitprojection') && $user->authorise('core.import', 'com_costbenefitprojection'))
 		{
-			// [7314] Get the import model
+			// [7315] Get the import model
 			$model = $this->getModel('Interventions');
-			// [7316] get the headers to import
+			// [7317] get the headers to import
 			$headers = $model->getExImPortHeaders();
 			if (CostbenefitprojectionHelper::checkObject($headers))
 			{
-				// [7320] Load headers to session.
+				// [7321] Load headers to session.
 				$session = JFactory::getSession();
 				$headers = json_encode($headers);
 				$session->set('intervention_VDM_IMPORTHEADERS', $headers);
 				$session->set('backto_VDM_IMPORT', 'interventions');
 				$session->set('dataType_VDM_IMPORTINTO', 'intervention');
-				// [7326] Redirect to import view.
+				// [7327] Redirect to import view.
 				$message = JText::_('COM_COSTBENEFITPROJECTION_IMPORT_SELECT_FILE_FOR_INTERVENTIONS');
 				$this->setRedirect(JRoute::_('index.php?option=com_costbenefitprojection&view=import', false), $message);
 				return;
 			}
 		}
-		// [7338] Redirect to the list screen with error.
+		// [7339] Redirect to the list screen with error.
 		$message = JText::_('COM_COSTBENEFITPROJECTION_IMPORT_FAILED');
 		$this->setRedirect(JRoute::_('index.php?option=com_costbenefitprojection&view=interventions', false), $message, 'error');
 		return;
diff --git a/admin/controllers/scaling_factor.php b/admin/controllers/scaling_factor.php
index c88cf30c..f47d78c1 100644
--- a/admin/controllers/scaling_factor.php
+++ b/admin/controllers/scaling_factor.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -54,13 +54,13 @@ class CostbenefitprojectionControllerScaling_factor extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
-		// [9327] Access check.
+		// [9328] Access check.
 		$access = JFactory::getUser()->authorise('scaling_factor.access', 'com_costbenefitprojection');
 		if (!$access)
 		{
 			return false;
 		}
-		// [9338] In the absense of better information, revert to the component permissions.
+		// [9339] In the absense of better information, revert to the component permissions.
 		return JFactory::getUser()->authorise('scaling_factor.create', $this->option);
 	}
 
@@ -76,9 +76,9 @@ class CostbenefitprojectionControllerScaling_factor extends JControllerForm
 	 */
 	protected function allowEdit($data = array(), $key = 'id')
 	{
-		// [9481] get user object.
+		// [9482] get user object.
 		$user		= JFactory::getUser();
-		// [9483] get record id.
+		// [9484] get record id.
 		$recordId	= (int) isset($data[$key]) ? $data[$key] : 0;
 		if (!$user->authorise('core.options', 'com_costbenefitprojection'))
 		{
@@ -91,7 +91,7 @@ class CostbenefitprojectionControllerScaling_factor extends JControllerForm
 			}
 		}
 
-		// [9490] Access check.
+		// [9491] Access check.
 		$access = ($user->authorise('scaling_factor.access', 'com_costbenefitprojection.scaling_factor.' . (int) $recordId) &&  $user->authorise('scaling_factor.access', 'com_costbenefitprojection'));
 		if (!$access)
 		{
@@ -100,17 +100,17 @@ class CostbenefitprojectionControllerScaling_factor extends JControllerForm
 
 		if ($recordId)
 		{
-			// [9499] The record has been set. Check the record permissions.
+			// [9500] The record has been set. Check the record permissions.
 			$permission = $user->authorise('scaling_factor.edit', 'com_costbenefitprojection.scaling_factor.' . (int) $recordId);
 			if (!$permission && !is_null($permission))
 			{
 				if ($user->authorise('scaling_factor.edit.own', 'com_costbenefitprojection.scaling_factor.' . $recordId))
 				{
-					// [9521] Now test the owner is the user.
+					// [9522] Now test the owner is the user.
 					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
 					if (empty($ownerId))
 					{
-						// [9525] Need to do a lookup from the model.
+						// [9526] Need to do a lookup from the model.
 						$record = $this->getModel()->getItem($recordId);
 
 						if (empty($record))
@@ -120,7 +120,7 @@ class CostbenefitprojectionControllerScaling_factor extends JControllerForm
 						$ownerId = $record->created_by;
 					}
 
-					// [9533] If the owner matches 'me' then allow.
+					// [9534] If the owner matches 'me' then allow.
 					if ($ownerId == $user->id)
 					{
 						if ($user->authorise('scaling_factor.edit.own', 'com_costbenefitprojection'))
@@ -132,7 +132,7 @@ class CostbenefitprojectionControllerScaling_factor extends JControllerForm
 				return false;
 			}
 		}
-		// [9555] Since there is no permission, revert to the component permissions.
+		// [9556] Since there is no permission, revert to the component permissions.
 		return $user->authorise('scaling_factor.edit', $this->option);
 	}
 
diff --git a/admin/controllers/scaling_factors.php b/admin/controllers/scaling_factors.php
index 93992a81..142fddd4 100644
--- a/admin/controllers/scaling_factors.php
+++ b/admin/controllers/scaling_factors.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -42,29 +42,29 @@ class CostbenefitprojectionControllerScaling_factors extends JControllerAdmin
 
 	public function exportData()
 	{
-		// [7277] Check for request forgeries
+		// [7278] Check for request forgeries
 		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
-		// [7279] check if export is allowed for this user.
+		// [7280] check if export is allowed for this user.
 		$user = JFactory::getUser();
 		if ($user->authorise('scaling_factor.export', 'com_costbenefitprojection') && $user->authorise('core.export', 'com_costbenefitprojection'))
 		{
-			// [7283] Get the input
+			// [7284] Get the input
 			$input = JFactory::getApplication()->input;
 			$pks = $input->post->get('cid', array(), 'array');
-			// [7286] Sanitize the input
+			// [7287] Sanitize the input
 			JArrayHelper::toInteger($pks);
-			// [7288] Get the model
+			// [7289] Get the model
 			$model = $this->getModel('Scaling_factors');
-			// [7290] get the data to export
+			// [7291] get the data to export
 			$data = $model->getExportData($pks);
 			if (CostbenefitprojectionHelper::checkArray($data))
 			{
-				// [7294] now set the data to the spreadsheet
+				// [7295] now set the data to the spreadsheet
 				$date = JFactory::getDate();
 				CostbenefitprojectionHelper::xls($data,'Scaling_factors_'.$date->format('jS_F_Y'),'Scaling factors exported ('.$date->format('jS F, Y').')','scaling factors');
 			}
 		}
-		// [7299] Redirect to the list screen with error.
+		// [7300] Redirect to the list screen with error.
 		$message = JText::_('COM_COSTBENEFITPROJECTION_EXPORT_FAILED');
 		$this->setRedirect(JRoute::_('index.php?option=com_costbenefitprojection&view=scaling_factors', false), $message, 'error');
 		return;
@@ -73,31 +73,31 @@ class CostbenefitprojectionControllerScaling_factors extends JControllerAdmin
 
 	public function importData()
 	{
-		// [7308] Check for request forgeries
+		// [7309] Check for request forgeries
 		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
-		// [7310] check if import is allowed for this user.
+		// [7311] check if import is allowed for this user.
 		$user = JFactory::getUser();
 		if ($user->authorise('scaling_factor.import', 'com_costbenefitprojection') && $user->authorise('core.import', 'com_costbenefitprojection'))
 		{
-			// [7314] Get the import model
+			// [7315] Get the import model
 			$model = $this->getModel('Scaling_factors');
-			// [7316] get the headers to import
+			// [7317] get the headers to import
 			$headers = $model->getExImPortHeaders();
 			if (CostbenefitprojectionHelper::checkObject($headers))
 			{
-				// [7320] Load headers to session.
+				// [7321] Load headers to session.
 				$session = JFactory::getSession();
 				$headers = json_encode($headers);
 				$session->set('scaling_factor_VDM_IMPORTHEADERS', $headers);
 				$session->set('backto_VDM_IMPORT', 'scaling_factors');
 				$session->set('dataType_VDM_IMPORTINTO', 'scaling_factor');
-				// [7326] Redirect to import view.
+				// [7327] Redirect to import view.
 				$message = JText::_('COM_COSTBENEFITPROJECTION_IMPORT_SELECT_FILE_FOR_SCALING_FACTORS');
 				$this->setRedirect(JRoute::_('index.php?option=com_costbenefitprojection&view=import', false), $message);
 				return;
 			}
 		}
-		// [7338] Redirect to the list screen with error.
+		// [7339] Redirect to the list screen with error.
 		$message = JText::_('COM_COSTBENEFITPROJECTION_IMPORT_FAILED');
 		$this->setRedirect(JRoute::_('index.php?option=com_costbenefitprojection&view=scaling_factors', false), $message, 'error');
 		return;
diff --git a/admin/controllers/service_provider.php b/admin/controllers/service_provider.php
index 506c29db..3f4ee9ca 100644
--- a/admin/controllers/service_provider.php
+++ b/admin/controllers/service_provider.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -54,13 +54,13 @@ class CostbenefitprojectionControllerService_provider extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
-		// [9327] Access check.
+		// [9328] Access check.
 		$access = JFactory::getUser()->authorise('service_provider.access', 'com_costbenefitprojection');
 		if (!$access)
 		{
 			return false;
 		}
-		// [9338] In the absense of better information, revert to the component permissions.
+		// [9339] In the absense of better information, revert to the component permissions.
 		return JFactory::getUser()->authorise('service_provider.create', $this->option);
 	}
 
@@ -76,9 +76,9 @@ class CostbenefitprojectionControllerService_provider extends JControllerForm
 	 */
 	protected function allowEdit($data = array(), $key = 'id')
 	{
-		// [9481] get user object.
+		// [9482] get user object.
 		$user		= JFactory::getUser();
-		// [9483] get record id.
+		// [9484] get record id.
 		$recordId	= (int) isset($data[$key]) ? $data[$key] : 0;
 		if (!$user->authorise('core.options', 'com_costbenefitprojection'))
 		{
@@ -90,7 +90,7 @@ class CostbenefitprojectionControllerService_provider extends JControllerForm
 			}
 		}
 
-		// [9490] Access check.
+		// [9491] Access check.
 		$access = ($user->authorise('service_provider.access', 'com_costbenefitprojection.service_provider.' . (int) $recordId) &&  $user->authorise('service_provider.access', 'com_costbenefitprojection'));
 		if (!$access)
 		{
@@ -99,17 +99,17 @@ class CostbenefitprojectionControllerService_provider extends JControllerForm
 
 		if ($recordId)
 		{
-			// [9499] The record has been set. Check the record permissions.
+			// [9500] The record has been set. Check the record permissions.
 			$permission = $user->authorise('service_provider.edit', 'com_costbenefitprojection.service_provider.' . (int) $recordId);
 			if (!$permission && !is_null($permission))
 			{
 				if ($user->authorise('service_provider.edit.own', 'com_costbenefitprojection.service_provider.' . $recordId))
 				{
-					// [9521] Now test the owner is the user.
+					// [9522] Now test the owner is the user.
 					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
 					if (empty($ownerId))
 					{
-						// [9525] Need to do a lookup from the model.
+						// [9526] Need to do a lookup from the model.
 						$record = $this->getModel()->getItem($recordId);
 
 						if (empty($record))
@@ -119,7 +119,7 @@ class CostbenefitprojectionControllerService_provider extends JControllerForm
 						$ownerId = $record->created_by;
 					}
 
-					// [9533] If the owner matches 'me' then allow.
+					// [9534] If the owner matches 'me' then allow.
 					if ($ownerId == $user->id)
 					{
 						if ($user->authorise('service_provider.edit.own', 'com_costbenefitprojection'))
@@ -131,7 +131,7 @@ class CostbenefitprojectionControllerService_provider extends JControllerForm
 				return false;
 			}
 		}
-		// [9555] Since there is no permission, revert to the component permissions.
+		// [9556] Since there is no permission, revert to the component permissions.
 		return $user->authorise('service_provider.edit', $this->option);
 	}
 
diff --git a/admin/controllers/service_providers.php b/admin/controllers/service_providers.php
index 449c6182..6c1c9e0d 100644
--- a/admin/controllers/service_providers.php
+++ b/admin/controllers/service_providers.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -42,29 +42,29 @@ class CostbenefitprojectionControllerService_providers extends JControllerAdmin
 
 	public function exportData()
 	{
-		// [7277] Check for request forgeries
+		// [7278] Check for request forgeries
 		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
-		// [7279] check if export is allowed for this user.
+		// [7280] check if export is allowed for this user.
 		$user = JFactory::getUser();
 		if ($user->authorise('service_provider.export', 'com_costbenefitprojection') && $user->authorise('core.export', 'com_costbenefitprojection'))
 		{
-			// [7283] Get the input
+			// [7284] Get the input
 			$input = JFactory::getApplication()->input;
 			$pks = $input->post->get('cid', array(), 'array');
-			// [7286] Sanitize the input
+			// [7287] Sanitize the input
 			JArrayHelper::toInteger($pks);
-			// [7288] Get the model
+			// [7289] Get the model
 			$model = $this->getModel('Service_providers');
-			// [7290] get the data to export
+			// [7291] get the data to export
 			$data = $model->getExportData($pks);
 			if (CostbenefitprojectionHelper::checkArray($data))
 			{
-				// [7294] now set the data to the spreadsheet
+				// [7295] now set the data to the spreadsheet
 				$date = JFactory::getDate();
 				CostbenefitprojectionHelper::xls($data,'Service_providers_'.$date->format('jS_F_Y'),'Service providers exported ('.$date->format('jS F, Y').')','service providers');
 			}
 		}
-		// [7299] Redirect to the list screen with error.
+		// [7300] Redirect to the list screen with error.
 		$message = JText::_('COM_COSTBENEFITPROJECTION_EXPORT_FAILED');
 		$this->setRedirect(JRoute::_('index.php?option=com_costbenefitprojection&view=service_providers', false), $message, 'error');
 		return;
@@ -73,31 +73,31 @@ class CostbenefitprojectionControllerService_providers extends JControllerAdmin
 
 	public function importData()
 	{
-		// [7308] Check for request forgeries
+		// [7309] Check for request forgeries
 		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
-		// [7310] check if import is allowed for this user.
+		// [7311] check if import is allowed for this user.
 		$user = JFactory::getUser();
 		if ($user->authorise('service_provider.import', 'com_costbenefitprojection') && $user->authorise('core.import', 'com_costbenefitprojection'))
 		{
-			// [7314] Get the import model
+			// [7315] Get the import model
 			$model = $this->getModel('Service_providers');
-			// [7316] get the headers to import
+			// [7317] get the headers to import
 			$headers = $model->getExImPortHeaders();
 			if (CostbenefitprojectionHelper::checkObject($headers))
 			{
-				// [7320] Load headers to session.
+				// [7321] Load headers to session.
 				$session = JFactory::getSession();
 				$headers = json_encode($headers);
 				$session->set('service_provider_VDM_IMPORTHEADERS', $headers);
 				$session->set('backto_VDM_IMPORT', 'service_providers');
 				$session->set('dataType_VDM_IMPORTINTO', 'service_provider');
-				// [7326] Redirect to import view.
+				// [7327] Redirect to import view.
 				$message = JText::_('COM_COSTBENEFITPROJECTION_IMPORT_SELECT_FILE_FOR_SERVICE_PROVIDERS');
 				$this->setRedirect(JRoute::_('index.php?option=com_costbenefitprojection&view=import', false), $message);
 				return;
 			}
 		}
-		// [7338] Redirect to the list screen with error.
+		// [7339] Redirect to the list screen with error.
 		$message = JText::_('COM_COSTBENEFITPROJECTION_IMPORT_FAILED');
 		$this->setRedirect(JRoute::_('index.php?option=com_costbenefitprojection&view=service_providers', false), $message, 'error');
 		return;
diff --git a/admin/costbenefitprojection.php b/admin/costbenefitprojection.php
index 8c74551c..4319f6cc 100644
--- a/admin/costbenefitprojection.php
+++ b/admin/costbenefitprojection.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/helpers/costbenefitprojection.php b/admin/helpers/costbenefitprojection.php
index 071173d1..3fe0c971 100644
--- a/admin/helpers/costbenefitprojection.php
+++ b/admin/helpers/costbenefitprojection.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -976,7 +976,7 @@ abstract class CostbenefitprojectionHelper
 	{
 		if (strpos($content,'class="uk-') !== false)
 		{
-			// [2605] reset
+			// [2606] reset
 			$temp = array();
 			foreach (self::$uk_components as $looking => $add)
 			{
@@ -985,15 +985,15 @@ abstract class CostbenefitprojectionHelper
 					$temp[] = $looking;
 				}
 			}
-			// [2614] make sure uikit is loaded to config
+			// [2615] make sure uikit is loaded to config
 			if (strpos($content,'class="uk-') !== false)
 			{
 				self::$uikit = true;
 			}
-			// [2619] sorter
+			// [2620] sorter
 			if (self::checkArray($temp))
 			{
-				// [2622] merger
+				// [2623] merger
 				if (self::checkArray($classes))
 				{
 					$newTemp = array_merge($temp,$classes);
diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php
index db8bc0cf..546d5b8c 100644
--- a/admin/helpers/html/batch_.php
+++ b/admin/helpers/html/batch_.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/helpers/sum.php b/admin/helpers/sum.php
index 8995ebb9..74aa18f7 100644
--- a/admin/helpers/sum.php
+++ b/admin/helpers/sum.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/helpers/sumcombine.php b/admin/helpers/sumcombine.php
index a58432f8..57a3dad8 100644
--- a/admin/helpers/sumcombine.php
+++ b/admin/helpers/sumcombine.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php
index 52eeda0e..ccd9e7d0 100644
--- a/admin/layouts/batchselection.php
+++ b/admin/layouts/batchselection.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/causerisk/details_above.php b/admin/layouts/causerisk/details_above.php
index b3cd6129..bf82e036 100644
--- a/admin/layouts/causerisk/details_above.php
+++ b/admin/layouts/causerisk/details_above.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/causerisk/details_left.php b/admin/layouts/causerisk/details_left.php
index b4b7f889..a4b98ee8 100644
--- a/admin/layouts/causerisk/details_left.php
+++ b/admin/layouts/causerisk/details_left.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/causerisk/publishing.php b/admin/layouts/causerisk/publishing.php
index 91211e65..5ccf6481 100644
--- a/admin/layouts/causerisk/publishing.php
+++ b/admin/layouts/causerisk/publishing.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/causerisk/publlshing.php b/admin/layouts/causerisk/publlshing.php
index 63d87556..bd970818 100644
--- a/admin/layouts/causerisk/publlshing.php
+++ b/admin/layouts/causerisk/publlshing.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/company/age_groups_percentages_fullwidth.php b/admin/layouts/company/age_groups_percentages_fullwidth.php
index 482f30d9..1ea14738 100644
--- a/admin/layouts/company/age_groups_percentages_fullwidth.php
+++ b/admin/layouts/company/age_groups_percentages_fullwidth.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/company/age_groups_percentages_left.php b/admin/layouts/company/age_groups_percentages_left.php
index 3dea1698..bb7726f8 100644
--- a/admin/layouts/company/age_groups_percentages_left.php
+++ b/admin/layouts/company/age_groups_percentages_left.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/company/age_groups_percentages_right.php b/admin/layouts/company/age_groups_percentages_right.php
index db968ee0..a5eb012b 100644
--- a/admin/layouts/company/age_groups_percentages_right.php
+++ b/admin/layouts/company/age_groups_percentages_right.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/company/causerisk_selection_fullwidth.php b/admin/layouts/company/causerisk_selection_fullwidth.php
index b88775f8..d7dfed82 100644
--- a/admin/layouts/company/causerisk_selection_fullwidth.php
+++ b/admin/layouts/company/causerisk_selection_fullwidth.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/company/details_above.php b/admin/layouts/company/details_above.php
index 5c24fa48..ab4079e6 100644
--- a/admin/layouts/company/details_above.php
+++ b/admin/layouts/company/details_above.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/company/details_left.php b/admin/layouts/company/details_left.php
index abbaf4ae..79c3d8e0 100644
--- a/admin/layouts/company/details_left.php
+++ b/admin/layouts/company/details_left.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/company/details_right.php b/admin/layouts/company/details_right.php
index 40f0927a..77f71906 100644
--- a/admin/layouts/company/details_right.php
+++ b/admin/layouts/company/details_right.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/company/details_under.php b/admin/layouts/company/details_under.php
index 310b74e5..b10f457c 100644
--- a/admin/layouts/company/details_under.php
+++ b/admin/layouts/company/details_under.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/company/interventions_fullwidth.php b/admin/layouts/company/interventions_fullwidth.php
index 623234f5..334679fe 100644
--- a/admin/layouts/company/interventions_fullwidth.php
+++ b/admin/layouts/company/interventions_fullwidth.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -22,7 +22,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items	= $displayData->ljeinterventions;
+$items	= $displayData->zjtinterventions;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit	= "index.php?option=com_costbenefitprojection&view=interventions&task=intervention.edit";
diff --git a/admin/layouts/company/publishing.php b/admin/layouts/company/publishing.php
index 91211e65..5ccf6481 100644
--- a/admin/layouts/company/publishing.php
+++ b/admin/layouts/company/publishing.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/company/publlshing.php b/admin/layouts/company/publlshing.php
index 63d87556..bd970818 100644
--- a/admin/layouts/company/publlshing.php
+++ b/admin/layouts/company/publlshing.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/company/scaling_factors_fullwidth.php b/admin/layouts/company/scaling_factors_fullwidth.php
index 8a42ddde..2e25143f 100644
--- a/admin/layouts/company/scaling_factors_fullwidth.php
+++ b/admin/layouts/company/scaling_factors_fullwidth.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -22,7 +22,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items	= $displayData->oabscaling_factors;
+$items	= $displayData->yosscaling_factors;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit	= "index.php?option=com_costbenefitprojection&view=scaling_factors&task=scaling_factor.edit";
diff --git a/admin/layouts/country/age_groups_percentages_left.php b/admin/layouts/country/age_groups_percentages_left.php
index 3dea1698..bb7726f8 100644
--- a/admin/layouts/country/age_groups_percentages_left.php
+++ b/admin/layouts/country/age_groups_percentages_left.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/country/age_groups_percentages_right.php b/admin/layouts/country/age_groups_percentages_right.php
index db968ee0..a5eb012b 100644
--- a/admin/layouts/country/age_groups_percentages_right.php
+++ b/admin/layouts/country/age_groups_percentages_right.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/country/causerisk_selection_fullwidth.php b/admin/layouts/country/causerisk_selection_fullwidth.php
index 97028a2c..e44a7aa0 100644
--- a/admin/layouts/country/causerisk_selection_fullwidth.php
+++ b/admin/layouts/country/causerisk_selection_fullwidth.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/country/companies_fullwidth.php b/admin/layouts/country/companies_fullwidth.php
index 5f91dce9..b1f111eb 100644
--- a/admin/layouts/country/companies_fullwidth.php
+++ b/admin/layouts/country/companies_fullwidth.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -22,7 +22,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items	= $displayData->yqdcompanies;
+$items	= $displayData->lqmcompanies;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit	= "index.php?option=com_costbenefitprojection&view=companies&task=company.edit";
diff --git a/admin/layouts/country/details_above.php b/admin/layouts/country/details_above.php
index ab86d103..55438903 100644
--- a/admin/layouts/country/details_above.php
+++ b/admin/layouts/country/details_above.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/country/details_left.php b/admin/layouts/country/details_left.php
index 2ab60bb7..dc1b7685 100644
--- a/admin/layouts/country/details_left.php
+++ b/admin/layouts/country/details_left.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/country/details_right.php b/admin/layouts/country/details_right.php
index e7a38a65..1a6d75b3 100644
--- a/admin/layouts/country/details_right.php
+++ b/admin/layouts/country/details_right.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/country/health_data_totals_left.php b/admin/layouts/country/health_data_totals_left.php
index a55dd5c4..0a515f49 100644
--- a/admin/layouts/country/health_data_totals_left.php
+++ b/admin/layouts/country/health_data_totals_left.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/country/health_data_totals_right.php b/admin/layouts/country/health_data_totals_right.php
index cba7b004..12600541 100644
--- a/admin/layouts/country/health_data_totals_right.php
+++ b/admin/layouts/country/health_data_totals_right.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/country/public_details_fullwidth.php b/admin/layouts/country/public_details_fullwidth.php
index d76daa83..56076a35 100644
--- a/admin/layouts/country/public_details_fullwidth.php
+++ b/admin/layouts/country/public_details_fullwidth.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/country/publishing.php b/admin/layouts/country/publishing.php
index 91211e65..5ccf6481 100644
--- a/admin/layouts/country/publishing.php
+++ b/admin/layouts/country/publishing.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/country/publlshing.php b/admin/layouts/country/publlshing.php
index 63d87556..bd970818 100644
--- a/admin/layouts/country/publlshing.php
+++ b/admin/layouts/country/publlshing.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/country/service_providers_fullwidth.php b/admin/layouts/country/service_providers_fullwidth.php
index 00cf4103..f9f15afa 100644
--- a/admin/layouts/country/service_providers_fullwidth.php
+++ b/admin/layouts/country/service_providers_fullwidth.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -22,7 +22,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items	= $displayData->hhiservice_providers;
+$items	= $displayData->mqkservice_providers;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit	= "index.php?option=com_costbenefitprojection&view=service_providers&task=service_provider.edit";
diff --git a/admin/layouts/currency/details_above.php b/admin/layouts/currency/details_above.php
index 3c9062b9..507fdcf9 100644
--- a/admin/layouts/currency/details_above.php
+++ b/admin/layouts/currency/details_above.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/currency/details_left.php b/admin/layouts/currency/details_left.php
index 60192a70..8fb3faae 100644
--- a/admin/layouts/currency/details_left.php
+++ b/admin/layouts/currency/details_left.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/currency/details_right.php b/admin/layouts/currency/details_right.php
index ac4b6a1f..e0850451 100644
--- a/admin/layouts/currency/details_right.php
+++ b/admin/layouts/currency/details_right.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/currency/publishing.php b/admin/layouts/currency/publishing.php
index 91211e65..5ccf6481 100644
--- a/admin/layouts/currency/publishing.php
+++ b/admin/layouts/currency/publishing.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/currency/publlshing.php b/admin/layouts/currency/publlshing.php
index 63d87556..bd970818 100644
--- a/admin/layouts/currency/publlshing.php
+++ b/admin/layouts/currency/publlshing.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/health_data/details_above.php b/admin/layouts/health_data/details_above.php
index 397318e4..3e6376c2 100644
--- a/admin/layouts/health_data/details_above.php
+++ b/admin/layouts/health_data/details_above.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/health_data/details_left.php b/admin/layouts/health_data/details_left.php
index e58433a7..7c9b5870 100644
--- a/admin/layouts/health_data/details_left.php
+++ b/admin/layouts/health_data/details_left.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/health_data/details_right.php b/admin/layouts/health_data/details_right.php
index aef7edd2..79c68889 100644
--- a/admin/layouts/health_data/details_right.php
+++ b/admin/layouts/health_data/details_right.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/health_data/details_rightside.php b/admin/layouts/health_data/details_rightside.php
index ad7dc217..c807e019 100644
--- a/admin/layouts/health_data/details_rightside.php
+++ b/admin/layouts/health_data/details_rightside.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/health_data/publishing.php b/admin/layouts/health_data/publishing.php
index 91211e65..5ccf6481 100644
--- a/admin/layouts/health_data/publishing.php
+++ b/admin/layouts/health_data/publishing.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/health_data/publlshing.php b/admin/layouts/health_data/publlshing.php
index 63d87556..bd970818 100644
--- a/admin/layouts/health_data/publlshing.php
+++ b/admin/layouts/health_data/publlshing.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/help_document/details_above.php b/admin/layouts/help_document/details_above.php
index 59e7ee8f..ebafa4e7 100644
--- a/admin/layouts/help_document/details_above.php
+++ b/admin/layouts/help_document/details_above.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/help_document/details_fullwidth.php b/admin/layouts/help_document/details_fullwidth.php
index 46c48381..e9f0c5fa 100644
--- a/admin/layouts/help_document/details_fullwidth.php
+++ b/admin/layouts/help_document/details_fullwidth.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/help_document/details_left.php b/admin/layouts/help_document/details_left.php
index 91857e3a..1dfb6003 100644
--- a/admin/layouts/help_document/details_left.php
+++ b/admin/layouts/help_document/details_left.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/help_document/details_right.php b/admin/layouts/help_document/details_right.php
index b75bb73f..1a9ff253 100644
--- a/admin/layouts/help_document/details_right.php
+++ b/admin/layouts/help_document/details_right.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/help_document/details_under.php b/admin/layouts/help_document/details_under.php
index 310b74e5..b10f457c 100644
--- a/admin/layouts/help_document/details_under.php
+++ b/admin/layouts/help_document/details_under.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/help_document/publishing.php b/admin/layouts/help_document/publishing.php
index 91211e65..5ccf6481 100644
--- a/admin/layouts/help_document/publishing.php
+++ b/admin/layouts/help_document/publishing.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/help_document/publlshing.php b/admin/layouts/help_document/publlshing.php
index d9ccbd71..3977f093 100644
--- a/admin/layouts/help_document/publlshing.php
+++ b/admin/layouts/help_document/publlshing.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/intervention/details_above.php b/admin/layouts/intervention/details_above.php
index 2e849d15..0c13f387 100644
--- a/admin/layouts/intervention/details_above.php
+++ b/admin/layouts/intervention/details_above.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/intervention/details_fullwidth.php b/admin/layouts/intervention/details_fullwidth.php
index de3643fa..36bc9af9 100644
--- a/admin/layouts/intervention/details_fullwidth.php
+++ b/admin/layouts/intervention/details_fullwidth.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/intervention/details_under.php b/admin/layouts/intervention/details_under.php
index 310b74e5..b10f457c 100644
--- a/admin/layouts/intervention/details_under.php
+++ b/admin/layouts/intervention/details_under.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/intervention/publishing.php b/admin/layouts/intervention/publishing.php
index 91211e65..5ccf6481 100644
--- a/admin/layouts/intervention/publishing.php
+++ b/admin/layouts/intervention/publishing.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/intervention/publlshing.php b/admin/layouts/intervention/publlshing.php
index d9ccbd71..3977f093 100644
--- a/admin/layouts/intervention/publlshing.php
+++ b/admin/layouts/intervention/publlshing.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/intervention/settings_fullwidth.php b/admin/layouts/intervention/settings_fullwidth.php
index 99092ac4..7f9c0c04 100644
--- a/admin/layouts/intervention/settings_fullwidth.php
+++ b/admin/layouts/intervention/settings_fullwidth.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/intervention/settings_left.php b/admin/layouts/intervention/settings_left.php
index ca2827b0..ad123b04 100644
--- a/admin/layouts/intervention/settings_left.php
+++ b/admin/layouts/intervention/settings_left.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/scaling_factor/details_above.php b/admin/layouts/scaling_factor/details_above.php
index 19c9cd5f..a3d08911 100644
--- a/admin/layouts/scaling_factor/details_above.php
+++ b/admin/layouts/scaling_factor/details_above.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/scaling_factor/details_left.php b/admin/layouts/scaling_factor/details_left.php
index f265a8ab..2ef4737e 100644
--- a/admin/layouts/scaling_factor/details_left.php
+++ b/admin/layouts/scaling_factor/details_left.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/scaling_factor/details_right.php b/admin/layouts/scaling_factor/details_right.php
index e24ef64e..52524bd0 100644
--- a/admin/layouts/scaling_factor/details_right.php
+++ b/admin/layouts/scaling_factor/details_right.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/scaling_factor/publishing.php b/admin/layouts/scaling_factor/publishing.php
index 91211e65..5ccf6481 100644
--- a/admin/layouts/scaling_factor/publishing.php
+++ b/admin/layouts/scaling_factor/publishing.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/scaling_factor/publlshing.php b/admin/layouts/scaling_factor/publlshing.php
index d9ccbd71..3977f093 100644
--- a/admin/layouts/scaling_factor/publlshing.php
+++ b/admin/layouts/scaling_factor/publlshing.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/service_provider/companies_fullwidth.php b/admin/layouts/service_provider/companies_fullwidth.php
index c11dc309..d0d72769 100644
--- a/admin/layouts/service_provider/companies_fullwidth.php
+++ b/admin/layouts/service_provider/companies_fullwidth.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -22,7 +22,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items	= $displayData->qqtcompanies;
+$items	= $displayData->zducompanies;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit	= "index.php?option=com_costbenefitprojection&view=companies&task=company.edit";
diff --git a/admin/layouts/service_provider/details_above.php b/admin/layouts/service_provider/details_above.php
index 5a761f33..70a7dddf 100644
--- a/admin/layouts/service_provider/details_above.php
+++ b/admin/layouts/service_provider/details_above.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/service_provider/details_fullwidth.php b/admin/layouts/service_provider/details_fullwidth.php
index 27d86d33..2c2e030a 100644
--- a/admin/layouts/service_provider/details_fullwidth.php
+++ b/admin/layouts/service_provider/details_fullwidth.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/service_provider/publishing.php b/admin/layouts/service_provider/publishing.php
index 91211e65..5ccf6481 100644
--- a/admin/layouts/service_provider/publishing.php
+++ b/admin/layouts/service_provider/publishing.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/layouts/service_provider/publlshing.php b/admin/layouts/service_provider/publlshing.php
index d9ccbd71..3977f093 100644
--- a/admin/layouts/service_provider/publlshing.php
+++ b/admin/layouts/service_provider/publlshing.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/models/ajax.php b/admin/models/ajax.php
index e73bd732..4e7679a8 100644
--- a/admin/models/ajax.php
+++ b/admin/models/ajax.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -37,13 +37,13 @@ class CostbenefitprojectionModelAjax extends JModelList
 		
 	}
 
-	// [8924] Used in company
+	// [8925] Used in company
 	public function getCalculatedResult($id,$data)
 	{
 		return CostbenefitprojectionHelper::calculate($id,$data);
 	}
 
-	// [8924] Used in intervention
+	// [8925] Used in intervention
 public function getInterventionBuildTable($idName,$oject,$cluster)
 	{
 		if (CostbenefitprojectionHelper::isJson($oject) && CostbenefitprojectionHelper::checkString($idName))
diff --git a/admin/models/causerisk.php b/admin/models/causerisk.php
index 648dce7c..b2824cfa 100644
--- a/admin/models/causerisk.php
+++ b/admin/models/causerisk.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -110,7 +110,7 @@ class CostbenefitprojectionModelCauserisk extends JModelAdmin
 	 * @since   1.6
 	 */
 	public function getForm($data = array(), $loadData = true)
-	{		// [9574] Get the form.
+	{		// [9575] Get the form.
 		$form = $this->loadForm('com_costbenefitprojection.causerisk', 'causerisk', array('control' => 'jform', 'load_data' => $loadData));
 
 		if (empty($form))
@@ -120,12 +120,12 @@ class CostbenefitprojectionModelCauserisk extends JModelAdmin
 
 		$jinput = JFactory::getApplication()->input;
 
-		// [9659] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first.
+		// [9660] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first.
 		if ($jinput->get('a_id'))
 		{
 			$id = $jinput->get('a_id', 0, 'INT');
 		}
-		// [9664] The back end uses id so we use that the rest of the time and set it to 0 by default.
+		// [9665] The back end uses id so we use that the rest of the time and set it to 0 by default.
 		else
 		{
 			$id = $jinput->get('id', 0, 'INT');
@@ -133,34 +133,34 @@ class CostbenefitprojectionModelCauserisk extends JModelAdmin
 
 		$user = JFactory::getUser();
 
-		// [9670] Check for existing item.
-		// [9671] Modify the form based on Edit State access controls.
+		// [9671] Check for existing item.
+		// [9672] Modify the form based on Edit State access controls.
 		if ($id != 0 && (!$user->authorise('causerisk.edit.state', 'com_costbenefitprojection.causerisk.' . (int) $id))
 			|| ($id == 0 && !$user->authorise('causerisk.edit.state', 'com_costbenefitprojection')))
 		{
-			// [9684] Disable fields for display.
+			// [9685] Disable fields for display.
 			$form->setFieldAttribute('ordering', 'disabled', 'true');
 			$form->setFieldAttribute('published', 'disabled', 'true');
-			// [9687] Disable fields while saving.
+			// [9688] Disable fields while saving.
 			$form->setFieldAttribute('ordering', 'filter', 'unset');
 			$form->setFieldAttribute('published', 'filter', 'unset');
 		}
-		// [9692] Modify the form based on Edit Creaded By access controls.
+		// [9693] Modify the form based on Edit Creaded By access controls.
 		if (!$user->authorise('core.edit.created_by', 'com_costbenefitprojection'))
 		{
-			// [9704] Disable fields for display.
+			// [9705] Disable fields for display.
 			$form->setFieldAttribute('created_by', 'disabled', 'true');
-			// [9706] Disable fields for display.
+			// [9707] Disable fields for display.
 			$form->setFieldAttribute('created_by', 'readonly', 'true');
-			// [9708] Disable fields while saving.
+			// [9709] Disable fields while saving.
 			$form->setFieldAttribute('created_by', 'filter', 'unset');
 		}
-		// [9711] Modify the form based on Edit Creaded Date access controls.
+		// [9712] Modify the form based on Edit Creaded Date access controls.
 		if (!$user->authorise('core.edit.created', 'com_costbenefitprojection'))
 		{
-			// [9723] Disable fields for display.
+			// [9724] Disable fields for display.
 			$form->setFieldAttribute('created', 'disabled', 'true');
-			// [9725] Disable fields while saving.
+			// [9726] Disable fields while saving.
 			$form->setFieldAttribute('created', 'filter', 'unset');
 		}
 
@@ -196,7 +196,7 @@ class CostbenefitprojectionModelCauserisk extends JModelAdmin
 			}
 
 			$user = JFactory::getUser();
-			// [9875] The record has been set. Check the record permissions.
+			// [9876] The record has been set. Check the record permissions.
 			return $user->authorise('causerisk.delete', 'com_costbenefitprojection.causerisk.' . (int) $record->id);
 		}
 		return false;
@@ -218,14 +218,14 @@ class CostbenefitprojectionModelCauserisk extends JModelAdmin
 
 		if ($recordId)
 		{
-			// [9962] The record has been set. Check the record permissions.
+			// [9963] The record has been set. Check the record permissions.
 			$permission = $user->authorise('causerisk.edit.state', 'com_costbenefitprojection.causerisk.' . (int) $recordId);
 			if (!$permission && !is_null($permission))
 			{
 				return false;
 			}
 		}
-		// [9979] In the absense of better information, revert to the component permissions.
+		// [9980] In the absense of better information, revert to the component permissions.
 		return $user->authorise('causerisk.edit.state', 'com_costbenefitprojection');
 	}
     
@@ -240,7 +240,7 @@ class CostbenefitprojectionModelCauserisk extends JModelAdmin
 	 */
 	protected function allowEdit($data = array(), $key = 'id')
 	{
-		// [9787] Check specific edit permission then general edit permission.
+		// [9788] Check specific edit permission then general edit permission.
 		$user = JFactory::getUser();
 
 		return $user->authorise('causerisk.edit', 'com_costbenefitprojection.causerisk.'. ((int) isset($data[$key]) ? $data[$key] : 0)) or $user->authorise('causerisk.edit',  'com_costbenefitprojection');
@@ -447,7 +447,7 @@ class CostbenefitprojectionModelCauserisk extends JModelAdmin
 	{
 		if (empty($this->batchSet))
 		{
-			// [4940] Set some needed variables.
+			// [4941] Set some needed variables.
 			$this->user 		= JFactory::getUser();
 			$this->table 		= $this->getTable();
 			$this->tableClassName	= get_class($this->table);
@@ -461,12 +461,12 @@ class CostbenefitprojectionModelCauserisk extends JModelAdmin
 			return false;
 		}
 
-		// [4960] get list of uniqe fields
+		// [4961] get list of uniqe fields
 		$uniqeFields = $this->getUniqeFields();
-		// [4962] remove move_copy from array
+		// [4963] remove move_copy from array
 		unset($values['move_copy']);
 
-		// [4965] make sure published is set
+		// [4966] make sure published is set
 		if (!isset($values['published']))
 		{
 			$values['published'] = 0;
@@ -478,21 +478,21 @@ class CostbenefitprojectionModelCauserisk extends JModelAdmin
 
 		$newIds = array();
 
-		// [5002] Parent exists so let's proceed
+		// [5003] Parent exists so let's proceed
 		while (!empty($pks))
 		{
-			// [5005] Pop the first ID off the stack
+			// [5006] Pop the first ID off the stack
 			$pk = array_shift($pks);
 
 			$this->table->reset();
 
-			// [5010] only allow copy if user may edit this item.
+			// [5011] only allow copy if user may edit this item.
 
 			if (!$this->user->authorise('causerisk.edit', $contexts[$pk]))
 
 			{
 
-				// [5020] Not fatal error
+				// [5021] Not fatal error
 
 				$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 
@@ -500,19 +500,19 @@ class CostbenefitprojectionModelCauserisk extends JModelAdmin
 
 			}
 
-			// [5025] Check that the row actually exists
+			// [5026] Check that the row actually exists
 			if (!$this->table->load($pk))
 			{
 				if ($error = $this->table->getError())
 				{
-					// [5030] Fatal error
+					// [5031] Fatal error
 					$this->setError($error);
 
 					return false;
 				}
 				else
 				{
-					// [5037] Not fatal error
+					// [5038] Not fatal error
 					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 					continue;
 				}
@@ -520,7 +520,7 @@ class CostbenefitprojectionModelCauserisk extends JModelAdmin
 
 			list($this->table->name, $this->table->alias) = $this->_generateNewTitle($this->table->alias, $this->table->name);
 
-			// [5073] insert all set values
+			// [5074] insert all set values
 			if (CostbenefitprojectionHelper::checkArray($values))
 			{
 				foreach ($values as $key => $value)
@@ -532,7 +532,7 @@ class CostbenefitprojectionModelCauserisk extends JModelAdmin
 				}
 			}
 
-			// [5085] update all uniqe fields
+			// [5086] update all uniqe fields
 			if (CostbenefitprojectionHelper::checkArray($uniqeFields))
 			{
 				foreach ($uniqeFields as $uniqeField)
@@ -541,13 +541,13 @@ class CostbenefitprojectionModelCauserisk extends JModelAdmin
 				}
 			}
 
-			// [5094] Reset the ID because we are making a copy
+			// [5095] Reset the ID because we are making a copy
 			$this->table->id = 0;
 
-			// [5097] TODO: Deal with ordering?
-			// [5098] $this->table->ordering	= 1;
+			// [5098] TODO: Deal with ordering?
+			// [5099] $this->table->ordering	= 1;
 
-			// [5100] Check the row.
+			// [5101] Check the row.
 			if (!$this->table->check())
 			{
 				$this->setError($this->table->getError());
@@ -560,7 +560,7 @@ class CostbenefitprojectionModelCauserisk extends JModelAdmin
 				$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
 			}
 
-			// [5113] Store the row.
+			// [5114] Store the row.
 			if (!$this->table->store())
 			{
 				$this->setError($this->table->getError());
@@ -568,14 +568,14 @@ class CostbenefitprojectionModelCauserisk extends JModelAdmin
 				return false;
 			}
 
-			// [5121] Get the new item ID
+			// [5122] Get the new item ID
 			$newId = $this->table->get('id');
 
-			// [5124] Add the new ID to the array
+			// [5125] Add the new ID to the array
 			$newIds[$pk] = $newId;
 		}
 
-		// [5128] Clean the cache
+		// [5129] Clean the cache
 		$this->cleanCache();
 
 		return $newIds;
@@ -596,7 +596,7 @@ class CostbenefitprojectionModelCauserisk extends JModelAdmin
 	{
 		if (empty($this->batchSet))
 		{
-			// [4742] Set some needed variables.
+			// [4743] Set some needed variables.
 			$this->user		= JFactory::getUser();
 			$this->table		= $this->getTable();
 			$this->tableClassName	= get_class($this->table);
@@ -611,15 +611,15 @@ class CostbenefitprojectionModelCauserisk extends JModelAdmin
 			return false;
 		}
 
-		// [4764] make sure published only updates if user has the permission.
+		// [4765] make sure published only updates if user has the permission.
 		if (isset($values['published']) && !$this->canDo->get('causerisk.edit.state'))
 		{
 			unset($values['published']);
 		}
-		// [4777] remove move_copy from array
+		// [4778] remove move_copy from array
 		unset($values['move_copy']);
 
-		// [4798] Parent exists so we proceed
+		// [4799] Parent exists so we proceed
 		foreach ($pks as $pk)
 		{
 			if (!$this->user->authorise('causerisk.edit', $contexts[$pk]))
@@ -629,30 +629,30 @@ class CostbenefitprojectionModelCauserisk extends JModelAdmin
 				return false;
 			}
 
-			// [4815] Check that the row actually exists
+			// [4816] Check that the row actually exists
 			if (!$this->table->load($pk))
 			{
 				if ($error = $this->table->getError())
 				{
-					// [4820] Fatal error
+					// [4821] Fatal error
 					$this->setError($error);
 
 					return false;
 				}
 				else
 				{
-					// [4827] Not fatal error
+					// [4828] Not fatal error
 					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 					continue;
 				}
 			}
 
-			// [4833] insert all set values.
+			// [4834] insert all set values.
 			if (CostbenefitprojectionHelper::checkArray($values))
 			{
 				foreach ($values as $key => $value)
 				{
-					// [4838] Do special action for access.
+					// [4839] Do special action for access.
 					if ('access' == $key && strlen($value) > 0)
 					{
 						$this->table->$key = $value;
@@ -665,7 +665,7 @@ class CostbenefitprojectionModelCauserisk extends JModelAdmin
 			}
 
 
-			// [4850] Check the row.
+			// [4851] Check the row.
 			if (!$this->table->check())
 			{
 				$this->setError($this->table->getError());
@@ -678,7 +678,7 @@ class CostbenefitprojectionModelCauserisk extends JModelAdmin
 				$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
 			}
 
-			// [4863] Store the row.
+			// [4864] Store the row.
 			if (!$this->table->store())
 			{
 				$this->setError($this->table->getError());
@@ -687,7 +687,7 @@ class CostbenefitprojectionModelCauserisk extends JModelAdmin
 			}
 		}
 
-		// [4872] Clean the cache
+		// [4873] Clean the cache
 		$this->cleanCache();
 
 		return true;
@@ -725,7 +725,7 @@ class CostbenefitprojectionModelCauserisk extends JModelAdmin
 			$data['params'] = (string) $params;
 		}
 
-		// [5154] Alter the name for save as copy
+		// [5155] Alter the name for save as copy
 		if ($input->get('task') == 'save2copy')
 		{
 			$origTable = clone $this->getTable();
@@ -748,7 +748,7 @@ class CostbenefitprojectionModelCauserisk extends JModelAdmin
 			$data['published'] = 0;
 		}
 
-		// [5181] Automatic handling of alias for empty fields
+		// [5182] Automatic handling of alias for empty fields
 		if (in_array($input->get('task'), array('apply', 'save', 'save2new')) && (int) $input->get('id') == 0)
 		{
 			if ($data['alias'] == null)
@@ -779,10 +779,10 @@ class CostbenefitprojectionModelCauserisk extends JModelAdmin
 			}
 		}
 
-		// [5220] Alter the uniqe field for save as copy
+		// [5221] Alter the uniqe field for save as copy
 		if ($input->get('task') == 'save2copy')
 		{
-			// [5223] Automatic handling of other uniqe fields
+			// [5224] Automatic handling of other uniqe fields
 			$uniqeFields = $this->getUniqeFields();
 			if (CostbenefitprojectionHelper::checkArray($uniqeFields))
 			{
@@ -836,7 +836,7 @@ class CostbenefitprojectionModelCauserisk extends JModelAdmin
 	protected function _generateNewTitle($alias, $title)
 	{
 
-		// [5254] Alter the title & alias
+		// [5255] Alter the title & alias
 		$table = $this->getTable();
 
 		while ($table->load(array('alias' => $alias)))
diff --git a/admin/models/causesrisks.php b/admin/models/causesrisks.php
index bf8113c6..1736d6a3 100644
--- a/admin/models/causesrisks.php
+++ b/admin/models/causesrisks.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -95,16 +95,16 @@ class CostbenefitprojectionModelCausesrisks extends JModelList
 	 */
 	public function getItems()
 	{ 
-		// [10544] check in items
+		// [10545] check in items
 		$this->checkInNow();
 
 		// load parent items
 		$items = parent::getItems();
 
-		// [10619] set values to display correctly.
+		// [10620] set values to display correctly.
 		if (CostbenefitprojectionHelper::checkArray($items))
 		{
-			// [10622] get user object.
+			// [10623] get user object.
 			$user = JFactory::getUser();
 			foreach ($items as $nr => &$item)
 			{
@@ -129,19 +129,19 @@ class CostbenefitprojectionModelCausesrisks extends JModelList
 	 */
 	protected function getListQuery()
 	{
-		// [7405] Get the user object.
+		// [7406] Get the user object.
 		$user = JFactory::getUser();
-		// [7407] Create a new query object.
+		// [7408] Create a new query object.
 		$db = JFactory::getDBO();
 		$query = $db->getQuery(true);
 
-		// [7410] Select some fields
+		// [7411] Select some fields
 		$query->select('a.*');
 
-		// [7417] From the costbenefitprojection_item table
+		// [7418] From the costbenefitprojection_item table
 		$query->from($db->quoteName('#__costbenefitprojection_causerisk', 'a'));
 
-		// [7431] Filter by published state
+		// [7432] Filter by published state
 		$published = $this->getState('filter.published');
 		if (is_numeric($published))
 		{
@@ -152,21 +152,21 @@ class CostbenefitprojectionModelCausesrisks extends JModelList
 			$query->where('(a.published = 0 OR a.published = 1)');
 		}
 
-		// [7443] Join over the asset groups.
+		// [7444] Join over the asset groups.
 		$query->select('ag.title AS access_level');
 		$query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
-		// [7446] Filter by access level.
+		// [7447] Filter by access level.
 		if ($access = $this->getState('filter.access'))
 		{
 			$query->where('a.access = ' . (int) $access);
 		}
-		// [7451] Implement View Level Access
+		// [7452] Implement View Level Access
 		if (!$user->authorise('core.options', 'com_costbenefitprojection'))
 		{
 			$groups = implode(',', $user->getAuthorisedViewLevels());
 			$query->where('a.access IN (' . $groups . ')');
 		}
-		// [7528] Filter by search.
+		// [7529] Filter by search.
 		$search = $this->getState('filter.search');
 		if (!empty($search))
 		{
@@ -182,7 +182,7 @@ class CostbenefitprojectionModelCausesrisks extends JModelList
 		}
 
 
-		// [7487] Add the list ordering clause.
+		// [7488] Add the list ordering clause.
 		$orderCol = $this->state->get('list.ordering', 'a.id');
 		$orderDirn = $this->state->get('list.direction', 'asc');	
 		if ($orderCol != '')
@@ -200,42 +200,42 @@ class CostbenefitprojectionModelCausesrisks extends JModelList
 	*/
 	public function getExportData($pks)
 	{
-		// [7195] setup the query
+		// [7196] setup the query
 		if (CostbenefitprojectionHelper::checkArray($pks))
 		{
-			// [7198] Get the user object.
+			// [7199] Get the user object.
 			$user = JFactory::getUser();
-			// [7200] Create a new query object.
+			// [7201] Create a new query object.
 			$db = JFactory::getDBO();
 			$query = $db->getQuery(true);
 
-			// [7203] Select some fields
+			// [7204] Select some fields
 			$query->select('a.*');
 
-			// [7205] From the costbenefitprojection_causerisk table
+			// [7206] From the costbenefitprojection_causerisk table
 			$query->from($db->quoteName('#__costbenefitprojection_causerisk', 'a'));
 			$query->where('a.id IN (' . implode(',',$pks) . ')');
-			// [7215] Implement View Level Access
+			// [7216] Implement View Level Access
 			if (!$user->authorise('core.options', 'com_costbenefitprojection'))
 			{
 				$groups = implode(',', $user->getAuthorisedViewLevels());
 				$query->where('a.access IN (' . $groups . ')');
 			}
 
-			// [7222] Order the results by ordering
+			// [7223] Order the results by ordering
 			$query->order('a.ordering  ASC');
 
-			// [7224] Load the items
+			// [7225] Load the items
 			$db->setQuery($query);
 			$db->execute();
 			if ($db->getNumRows())
 			{
 				$items = $db->loadObjectList();
 
-				// [10619] set values to display correctly.
+				// [10620] set values to display correctly.
 				if (CostbenefitprojectionHelper::checkArray($items))
 				{
-					// [10622] get user object.
+					// [10623] get user object.
 					$user = JFactory::getUser();
 					foreach ($items as $nr => &$item)
 					{
@@ -246,13 +246,13 @@ class CostbenefitprojectionModelCausesrisks extends JModelList
 							continue;
 						}
 
-						// [10832] unset the values we don't want exported.
+						// [10833] unset the values we don't want exported.
 						unset($item->asset_id);
 						unset($item->checked_out);
 						unset($item->checked_out_time);
 					}
 				}
-				// [10841] Add headers to items array.
+				// [10842] Add headers to items array.
 				$headers = $this->getExImPortHeaders();
 				if (CostbenefitprojectionHelper::checkObject($headers))
 				{
@@ -271,13 +271,13 @@ class CostbenefitprojectionModelCausesrisks extends JModelList
 	*/
 	public function getExImPortHeaders()
 	{
-		// [7244] Get a db connection.
+		// [7245] Get a db connection.
 		$db = JFactory::getDbo();
-		// [7246] get the columns
+		// [7247] get the columns
 		$columns = $db->getTableColumns("#__costbenefitprojection_causerisk");
 		if (CostbenefitprojectionHelper::checkArray($columns))
 		{
-			// [7250] remove the headers you don't import/export.
+			// [7251] remove the headers you don't import/export.
 			unset($columns['asset_id']);
 			unset($columns['checked_out']);
 			unset($columns['checked_out_time']);
@@ -299,7 +299,7 @@ class CostbenefitprojectionModelCausesrisks extends JModelList
 	 */
 	protected function getStoreId($id = '')
 	{
-		// [10167] Compile the store id.
+		// [10168] Compile the store id.
 		$id .= ':' . $this->getState('filter.id');
 		$id .= ':' . $this->getState('filter.search');
 		$id .= ':' . $this->getState('filter.published');
@@ -320,15 +320,15 @@ class CostbenefitprojectionModelCausesrisks extends JModelList
 	*/
 	protected function checkInNow()
 	{
-		// [10560] Get set check in time
+		// [10561] Get set check in time
 		$time = JComponentHelper::getParams('com_costbenefitprojection')->get('check_in');
 		
 		if ($time)
 		{
 
-			// [10565] Get a db connection.
+			// [10566] Get a db connection.
 			$db = JFactory::getDbo();
-			// [10567] reset query
+			// [10568] reset query
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__costbenefitprojection_causerisk'));
@@ -336,24 +336,24 @@ class CostbenefitprojectionModelCausesrisks extends JModelList
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// [10575] Get Yesterdays date
+				// [10576] Get Yesterdays date
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// [10577] reset query
+				// [10578] reset query
 				$query = $db->getQuery(true);
 
-				// [10579] Fields to update.
+				// [10580] Fields to update.
 				$fields = array(
 					$db->quoteName('checked_out_time') . '=\'0000-00-00 00:00:00\'',
 					$db->quoteName('checked_out') . '=0'
 				);
 
-				// [10584] Conditions for which records should be updated.
+				// [10585] Conditions for which records should be updated.
 				$conditions = array(
 					$db->quoteName('checked_out') . '!=0', 
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);
 
-				// [10589] Check table
+				// [10590] Check table
 				$query->update($db->quoteName('#__costbenefitprojection_causerisk'))->set($fields)->where($conditions); 
 
 				$db->setQuery($query);
diff --git a/admin/models/combinedresults.php b/admin/models/combinedresults.php
index f17f5ab9..2850e604 100644
--- a/admin/models/combinedresults.php
+++ b/admin/models/combinedresults.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -90,12 +90,12 @@ class CostbenefitprojectionModelCombinedresults extends JModelList
 				JFactory::getApplication()->redirect('index.php?option=com_costbenefitprojection&view=cpanel');
 			}
 		} 
-		// [2912] Make sure all records load, since no pagination allowed.
+		// [2913] Make sure all records load, since no pagination allowed.
 		$this->setState('list.limit', 0);
-		// [2914] Get a db connection.
+		// [2915] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2917] Create a new query object.
+		// [2918] Create a new query object.
 		$query = $db->getQuery(true);
 
 		// [1791] Get from #__costbenefitprojection_company as a
@@ -115,7 +115,7 @@ class CostbenefitprojectionModelCombinedresults extends JModelList
 			array('f.id','f.name','f.alias','f.codethree','f.numericcode','f.symbol','f.thousands','f.decimalplace','f.decimalsymbol','f.positivestyle','f.negativestyle','f.published','f.access','f.ordering'),
 			array('currency_id','currency_name','currency_alias','currency_codethree','currency_numericcode','currency_symbol','currency_thousands','currency_decimalplace','currency_decimalsymbol','currency_positivestyle','currency_negativestyle','currency_published','currency_access','currency_ordering')));
 		$query->join('LEFT', ($db->quoteName('#__costbenefitprojection_currency', 'f')) . ' ON (' . $db->quoteName('e.currency') . ' = ' . $db->quoteName('f.codethree') . ')');
-		// [2127] Check if $ids is an array with values.
+		// [2123] Check if $ids is an array with values.
 		$array = $ids;
 		if (isset($array) && CostbenefitprojectionHelper::checkArray($array))
 		{
@@ -126,7 +126,7 @@ class CostbenefitprojectionModelCombinedresults extends JModelList
 			return false;
 		}
 
-		// [2930] return the query object
+		// [2931] return the query object
 		return $query;
 	}
 
@@ -152,89 +152,89 @@ class CostbenefitprojectionModelCombinedresults extends JModelList
 		// Get the global params
 		$globalParams = JComponentHelper::getParams('com_costbenefitprojection', true);
 
-		// [3019] Get the advanced encription.
+		// [3020] Get the advanced encription.
 		$advancedkey = CostbenefitprojectionHelper::getCryptKey('advanced');
-		// [3021] Get the encription object.
+		// [3022] Get the encription object.
 		$advanced = new FOFEncryptAes($advancedkey, 256);
 
-		// [2945] Convert the parameter fields into objects.
+		// [2946] Convert the parameter fields into objects.
 		foreach ($items as $nr => &$item)
 		{
-			// [2948] Always create a slug for sef URL's
+			// [2949] Always create a slug for sef URL's
 			$item->slug = (isset($item->alias)) ? $item->id.':'.$item->alias : $item->id;
 			if (!empty($item->medical_turnovers_males) && $advancedkey && !is_numeric($item->medical_turnovers_males) && $item->medical_turnovers_males === base64_encode(base64_decode($item->medical_turnovers_males, true)))
 			{
-				// [1997] Decode medical_turnovers_males
+				// [1993] Decode medical_turnovers_males
 				$item->medical_turnovers_males = rtrim($advanced->decryptString($item->medical_turnovers_males), "\0");
 			}
 			if (!empty($item->sick_leave_males) && $advancedkey && !is_numeric($item->sick_leave_males) && $item->sick_leave_males === base64_encode(base64_decode($item->sick_leave_males, true)))
 			{
-				// [1997] Decode sick_leave_males
+				// [1993] Decode sick_leave_males
 				$item->sick_leave_males = rtrim($advanced->decryptString($item->sick_leave_males), "\0");
 			}
 			if (!empty($item->males) && $advancedkey && !is_numeric($item->males) && $item->males === base64_encode(base64_decode($item->males, true)))
 			{
-				// [1997] Decode males
+				// [1993] Decode males
 				$item->males = rtrim($advanced->decryptString($item->males), "\0");
 			}
 			if (CostbenefitprojectionHelper::checkString($item->causesrisks))
 			{
-				// [1997] Decode causesrisks
+				// [1993] Decode causesrisks
 				$item->causesrisks = json_decode($item->causesrisks, true);
 			}
 			if (!empty($item->females) && $advancedkey && !is_numeric($item->females) && $item->females === base64_encode(base64_decode($item->females, true)))
 			{
-				// [1997] Decode females
+				// [1993] Decode females
 				$item->females = rtrim($advanced->decryptString($item->females), "\0");
 			}
 			if (!empty($item->medical_turnovers_females) && $advancedkey && !is_numeric($item->medical_turnovers_females) && $item->medical_turnovers_females === base64_encode(base64_decode($item->medical_turnovers_females, true)))
 			{
-				// [1997] Decode medical_turnovers_females
+				// [1993] Decode medical_turnovers_females
 				$item->medical_turnovers_females = rtrim($advanced->decryptString($item->medical_turnovers_females), "\0");
 			}
 			if (!empty($item->sick_leave_females) && $advancedkey && !is_numeric($item->sick_leave_females) && $item->sick_leave_females === base64_encode(base64_decode($item->sick_leave_females, true)))
 			{
-				// [1997] Decode sick_leave_females
+				// [1993] Decode sick_leave_females
 				$item->sick_leave_females = rtrim($advanced->decryptString($item->sick_leave_females), "\0");
 			}
 			if (!empty($item->total_salary) && $advancedkey && !is_numeric($item->total_salary) && $item->total_salary === base64_encode(base64_decode($item->total_salary, true)))
 			{
-				// [1997] Decode total_salary
+				// [1993] Decode total_salary
 				$item->total_salary = rtrim($advanced->decryptString($item->total_salary), "\0");
 			}
 			if (!empty($item->total_healthcare) && $advancedkey && !is_numeric($item->total_healthcare) && $item->total_healthcare === base64_encode(base64_decode($item->total_healthcare, true)))
 			{
-				// [1997] Decode total_healthcare
+				// [1993] Decode total_healthcare
 				$item->total_healthcare = rtrim($advanced->decryptString($item->total_healthcare), "\0");
 			}
 			if (CostbenefitprojectionHelper::checkString($item->country_causesrisks))
 			{
-				// [1997] Decode country_causesrisks
+				// [1993] Decode country_causesrisks
 				$item->country_causesrisks = json_decode($item->country_causesrisks, true);
 			}
-			// [2012] Make sure the content prepare plugins fire on country_publicaddress.
+			// [2008] Make sure the content prepare plugins fire on country_publicaddress.
 			$item->country_publicaddress = JHtml::_('content.prepare',$item->country_publicaddress);
-			// [2014] Checking if country_publicaddress has uikit components that must be loaded.
+			// [2010] Checking if country_publicaddress has uikit components that must be loaded.
 			$this->uikitComp = CostbenefitprojectionHelper::getUikitComp($item->country_publicaddress,$this->uikitComp);
-			// [2312] set the global causesrisks value.
+			// [2313] set the global causesrisks value.
 			$this->a_causesrisks = $item->causesrisks;
-			// [2312] set the global datayear value.
+			// [2313] set the global datayear value.
 			$this->a_datayear = $item->datayear;
-			// [2312] set the global datayear value.
+			// [2313] set the global datayear value.
 			$this->e_datayear = $item->country_datayear;
-			// [2312] set the global causesrisks value.
+			// [2313] set the global causesrisks value.
 			$this->e_causesrisks = $item->country_causesrisks;
-			// [2045] set countryCountryHealth_dataB to the $item object.
+			// [2041] set countryCountryHealth_dataB to the $item object.
 			$item->countryCountryHealth_dataB = $this->getCountryCountryHealth_dataBcbb_B($item->country);
-			// [2045] set idCompanyScaling_factorC to the $item object.
+			// [2041] set idCompanyScaling_factorC to the $item object.
 			$item->idCompanyScaling_factorC = $this->getIdCompanyScaling_factorBcbb_C($item->id);
-			// [2045] set idCompanyInterventionD to the $item object.
+			// [2041] set idCompanyInterventionD to the $item object.
 			$item->idCompanyInterventionD = $this->getIdCompanyInterventionBcbb_D($item->id);
-			// [2045] set causesrisksIdCauseriskG to the $item object.
+			// [2041] set causesrisksIdCauseriskG to the $item object.
 			$item->causesrisksIdCauseriskG = $this->getCausesrisksIdCauseriskBcbb_G($item->causesrisks);
-			// [2045] set countryCountryHealth_dataBB to the $item object.
+			// [2041] set countryCountryHealth_dataBB to the $item object.
 			$item->countryCountryHealth_dataBB = $this->getCountryCountryHealth_dataBcbb_BB($item->country);
-			// [2045] set causesrisksIdCauseriskGG to the $item object.
+			// [2041] set causesrisksIdCauseriskGG to the $item object.
 			$item->causesrisksIdCauseriskGG = $this->getCausesrisksIdCauseriskBcbb_GG($item->country_causesrisks);
 		} 
 
@@ -250,19 +250,19 @@ class CostbenefitprojectionModelCombinedresults extends JModelList
 	*/
 	public function getCountryCountryHealth_dataBcbb_B($country)
 	{
-		// [2710] Get a db connection.
+		// [2711] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2712] Create a new query object.
+		// [2713] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2714] Get from #__costbenefitprojection_health_data as b
+		// [2715] Get from #__costbenefitprojection_health_data as b
 		$query->select($db->quoteName(
 			array('b.id','b.causerisk','b.year','b.maledeath','b.maleyld','b.femaledeath','b.femaleyld','b.published'),
 			array('id','causerisk','year','maledeath','maleyld','femaledeath','femaleyld','published')));
 		$query->from($db->quoteName('#__costbenefitprojection_health_data', 'b'));
 		$query->where('b.country = ' . $db->quote($country));
-		// [2127] Check if $this->a_causesrisks is an array with values.
+		// [2123] Check if $this->a_causesrisks is an array with values.
 		$array = $this->a_causesrisks;
 		if (isset($array) && CostbenefitprojectionHelper::checkArray($array))
 		{
@@ -276,11 +276,11 @@ class CostbenefitprojectionModelCombinedresults extends JModelList
 		$query->where('b.year = ' . $db->quote($this->a_datayear));
 		$query->order('b.ordering ASC');
 
-		// [2768] Reset the query using our newly populated query object.
+		// [2769] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2771] check if there was data returned
+		// [2772] check if there was data returned
 		if ($db->getNumRows())
 		{
 			return $db->loadObjectList();
@@ -296,13 +296,13 @@ class CostbenefitprojectionModelCombinedresults extends JModelList
 	*/
 	public function getIdCompanyScaling_factorBcbb_C($id)
 	{
-		// [2710] Get a db connection.
+		// [2711] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2712] Create a new query object.
+		// [2713] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2714] Get from #__costbenefitprojection_scaling_factor as c
+		// [2715] Get from #__costbenefitprojection_scaling_factor as c
 		$query->select($db->quoteName(
 			array('c.id','c.causerisk','c.reference','c.yld_scaling_factor_males','c.yld_scaling_factor_females','c.mortality_scaling_factor_males','c.mortality_scaling_factor_females','c.presenteeism_scaling_factor_males','c.presenteeism_scaling_factor_females','c.health_scaling_factor','c.published'),
 			array('id','causerisk','reference','yld_scaling_factor_males','yld_scaling_factor_females','mortality_scaling_factor_males','mortality_scaling_factor_females','presenteeism_scaling_factor_males','presenteeism_scaling_factor_females','health_scaling_factor','published')));
@@ -311,21 +311,21 @@ class CostbenefitprojectionModelCombinedresults extends JModelList
 		$query->where('c.published = 1');
 		$query->order('c.ordering ASC');
 
-		// [2768] Reset the query using our newly populated query object.
+		// [2769] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2771] check if there was data returned
+		// [2772] check if there was data returned
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [2824] Convert the parameter fields into objects.
+			// [2825] Convert the parameter fields into objects.
 			foreach ($items as $nr => &$item)
 			{
-				// [2012] Make sure the content prepare plugins fire on reference.
+				// [2008] Make sure the content prepare plugins fire on reference.
 				$item->reference = JHtml::_('content.prepare',$item->reference);
-				// [2014] Checking if reference has uikit components that must be loaded.
+				// [2010] Checking if reference has uikit components that must be loaded.
 				$this->uikitComp = CostbenefitprojectionHelper::getUikitComp($item->reference,$this->uikitComp);
 			}
 			return $items;
@@ -341,13 +341,13 @@ class CostbenefitprojectionModelCombinedresults extends JModelList
 	*/
 	public function getIdCompanyInterventionBcbb_D($id)
 	{
-		// [2710] Get a db connection.
+		// [2711] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2712] Create a new query object.
+		// [2713] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2714] Get from #__costbenefitprojection_intervention as d
+		// [2715] Get from #__costbenefitprojection_intervention as d
 		$query->select($db->quoteName(
 			array('d.id','d.name','d.type','d.coverage','d.duration','d.share','d.description','d.reference','d.intervention','d.published','d.created_by','d.modified_by','d.created','d.modified'),
 			array('id','name','type','coverage','duration','share','description','reference','intervention','published','created_by','modified_by','created','modified')));
@@ -356,25 +356,25 @@ class CostbenefitprojectionModelCombinedresults extends JModelList
 		$query->where('d.published = 1');
 		$query->order('d.ordering ASC');
 
-		// [2768] Reset the query using our newly populated query object.
+		// [2769] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2771] check if there was data returned
+		// [2772] check if there was data returned
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [2824] Convert the parameter fields into objects.
+			// [2825] Convert the parameter fields into objects.
 			foreach ($items as $nr => &$item)
 			{
-				// [2012] Make sure the content prepare plugins fire on description.
+				// [2008] Make sure the content prepare plugins fire on description.
 				$item->description = JHtml::_('content.prepare',$item->description);
-				// [2014] Checking if description has uikit components that must be loaded.
+				// [2010] Checking if description has uikit components that must be loaded.
 				$this->uikitComp = CostbenefitprojectionHelper::getUikitComp($item->description,$this->uikitComp);
-				// [2012] Make sure the content prepare plugins fire on reference.
+				// [2008] Make sure the content prepare plugins fire on reference.
 				$item->reference = JHtml::_('content.prepare',$item->reference);
-				// [2014] Checking if reference has uikit components that must be loaded.
+				// [2010] Checking if reference has uikit components that must be loaded.
 				$this->uikitComp = CostbenefitprojectionHelper::getUikitComp($item->reference,$this->uikitComp);
 			}
 			return $items;
@@ -390,19 +390,19 @@ class CostbenefitprojectionModelCombinedresults extends JModelList
 	*/
 	public function getCausesrisksIdCauseriskBcbb_G($causesrisks)
 	{
-		// [2710] Get a db connection.
+		// [2711] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2712] Create a new query object.
+		// [2713] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2714] Get from #__costbenefitprojection_causerisk as g
+		// [2715] Get from #__costbenefitprojection_causerisk as g
 		$query->select($db->quoteName(
 			array('g.id','g.name','g.ref','g.alias','g.description'),
 			array('id','name','ref','alias','description')));
 		$query->from($db->quoteName('#__costbenefitprojection_causerisk', 'g'));
 
-		// [2720] Check if $causesrisks is an array with values.
+		// [2721] Check if $causesrisks is an array with values.
 		$array = $causesrisks;
 		if (isset($array) && CostbenefitprojectionHelper::checkArray($array))
 		{
@@ -413,21 +413,21 @@ class CostbenefitprojectionModelCombinedresults extends JModelList
 			return false;
 		}
 
-		// [2768] Reset the query using our newly populated query object.
+		// [2769] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2771] check if there was data returned
+		// [2772] check if there was data returned
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [2824] Convert the parameter fields into objects.
+			// [2825] Convert the parameter fields into objects.
 			foreach ($items as $nr => &$item)
 			{
-				// [2012] Make sure the content prepare plugins fire on description.
+				// [2008] Make sure the content prepare plugins fire on description.
 				$item->description = JHtml::_('content.prepare',$item->description);
-				// [2014] Checking if description has uikit components that must be loaded.
+				// [2010] Checking if description has uikit components that must be loaded.
 				$this->uikitComp = CostbenefitprojectionHelper::getUikitComp($item->description,$this->uikitComp);
 			}
 			return $items;
@@ -443,19 +443,19 @@ class CostbenefitprojectionModelCombinedresults extends JModelList
 	*/
 	public function getCountryCountryHealth_dataBcbb_BB($country)
 	{
-		// [2710] Get a db connection.
+		// [2711] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2712] Create a new query object.
+		// [2713] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2714] Get from #__costbenefitprojection_health_data as bb
+		// [2715] Get from #__costbenefitprojection_health_data as bb
 		$query->select($db->quoteName(
 			array('bb.id','bb.asset_id','bb.causerisk','bb.year','bb.country','bb.maledeath','bb.maleyld','bb.femaledeath','bb.femaleyld','bb.published','bb.created_by','bb.modified_by','bb.created','bb.modified','bb.version','bb.hits','bb.ordering'),
 			array('id','asset_id','causerisk','year','country','maledeath','maleyld','femaledeath','femaleyld','published','created_by','modified_by','created','modified','version','hits','ordering')));
 		$query->from($db->quoteName('#__costbenefitprojection_health_data', 'bb'));
 		$query->where('bb.country = ' . $db->quote($country));
-		// [2127] Check if $this->e_causesrisks is an array with values.
+		// [2123] Check if $this->e_causesrisks is an array with values.
 		$array = $this->e_causesrisks;
 		if (isset($array) && CostbenefitprojectionHelper::checkArray($array))
 		{
@@ -469,11 +469,11 @@ class CostbenefitprojectionModelCombinedresults extends JModelList
 		$query->where('bb.year = ' . $db->quote($this->e_datayear));
 		$query->order('bb.ordering ASC');
 
-		// [2768] Reset the query using our newly populated query object.
+		// [2769] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2771] check if there was data returned
+		// [2772] check if there was data returned
 		if ($db->getNumRows())
 		{
 			return $db->loadObjectList();
@@ -489,19 +489,19 @@ class CostbenefitprojectionModelCombinedresults extends JModelList
 	*/
 	public function getCausesrisksIdCauseriskBcbb_GG($causesrisks)
 	{
-		// [2710] Get a db connection.
+		// [2711] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2712] Create a new query object.
+		// [2713] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2714] Get from #__costbenefitprojection_causerisk as gg
+		// [2715] Get from #__costbenefitprojection_causerisk as gg
 		$query->select($db->quoteName(
 			array('gg.id','gg.name','gg.ref','gg.alias','gg.description'),
 			array('id','name','ref','alias','description')));
 		$query->from($db->quoteName('#__costbenefitprojection_causerisk', 'gg'));
 
-		// [2720] Check if $causesrisks is an array with values.
+		// [2721] Check if $causesrisks is an array with values.
 		$array = $causesrisks;
 		if (isset($array) && CostbenefitprojectionHelper::checkArray($array))
 		{
@@ -512,21 +512,21 @@ class CostbenefitprojectionModelCombinedresults extends JModelList
 			return false;
 		}
 
-		// [2768] Reset the query using our newly populated query object.
+		// [2769] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2771] check if there was data returned
+		// [2772] check if there was data returned
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [2824] Convert the parameter fields into objects.
+			// [2825] Convert the parameter fields into objects.
 			foreach ($items as $nr => &$item)
 			{
-				// [2012] Make sure the content prepare plugins fire on description.
+				// [2008] Make sure the content prepare plugins fire on description.
 				$item->description = JHtml::_('content.prepare',$item->description);
-				// [2014] Checking if description has uikit components that must be loaded.
+				// [2010] Checking if description has uikit components that must be loaded.
 				$this->uikitComp = CostbenefitprojectionHelper::getUikitComp($item->description,$this->uikitComp);
 			}
 			return $items;
diff --git a/admin/models/companies.php b/admin/models/companies.php
index e266a45a..debd450a 100644
--- a/admin/models/companies.php
+++ b/admin/models/companies.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -111,16 +111,16 @@ class CostbenefitprojectionModelCompanies extends JModelList
 	 */
 	public function getItems()
 	{ 
-		// [10544] check in items
+		// [10545] check in items
 		$this->checkInNow();
 
 		// load parent items
 		$items = parent::getItems();
 
-		// [10619] set values to display correctly.
+		// [10620] set values to display correctly.
 		if (CostbenefitprojectionHelper::checkArray($items))
 		{
-			// [10622] get user object.
+			// [10623] get user object.
 			$user = JFactory::getUser();
 			foreach ($items as $nr => &$item)
 			{
@@ -134,14 +134,14 @@ class CostbenefitprojectionModelCompanies extends JModelList
 			}
 		} 
 
-		// [10885] set selection value to a translatable value
+		// [10886] set selection value to a translatable value
 		if (CostbenefitprojectionHelper::checkArray($items))
 		{
 			foreach ($items as $nr => &$item)
 			{
-				// [10892] convert department
+				// [10893] convert department
 				$item->department = $this->selectionTranslation($item->department, 'department');
-				// [10892] convert per
+				// [10893] convert per
 				$item->per = $this->selectionTranslation($item->per, 'per');
 			}
 		}
@@ -158,27 +158,27 @@ class CostbenefitprojectionModelCompanies extends JModelList
 	*/
 	public function selectionTranslation($value,$name)
 	{
-		// [10918] Array of department language strings
+		// [10919] Array of department language strings
 		if ($name == 'department')
 		{
 			$departmentArray = array(
 				1 => 'COM_COSTBENEFITPROJECTION_COMPANY_BASIC',
 				2 => 'COM_COSTBENEFITPROJECTION_COMPANY_ADVANCED'
 			);
-			// [10949] Now check if value is found in this array
+			// [10950] Now check if value is found in this array
 			if (isset($departmentArray[$value]) && CostbenefitprojectionHelper::checkString($departmentArray[$value]))
 			{
 				return $departmentArray[$value];
 			}
 		}
-		// [10918] Array of per language strings
+		// [10919] Array of per language strings
 		if ($name == 'per')
 		{
 			$perArray = array(
 				1 => 'COM_COSTBENEFITPROJECTION_COMPANY_OPEN',
 				0 => 'COM_COSTBENEFITPROJECTION_COMPANY_LOCKED'
 			);
-			// [10949] Now check if value is found in this array
+			// [10950] Now check if value is found in this array
 			if (isset($perArray[$value]) && CostbenefitprojectionHelper::checkString($perArray[$value]))
 			{
 				return $perArray[$value];
@@ -194,16 +194,16 @@ class CostbenefitprojectionModelCompanies extends JModelList
 	 */
 	protected function getListQuery()
 	{
-		// [7405] Get the user object.
+		// [7406] Get the user object.
 		$user = JFactory::getUser();
-		// [7407] Create a new query object.
+		// [7408] Create a new query object.
 		$db = JFactory::getDBO();
 		$query = $db->getQuery(true);
 
-		// [7410] Select some fields
+		// [7411] Select some fields
 		$query->select('a.*');
 
-		// [7417] From the costbenefitprojection_item table
+		// [7418] From the costbenefitprojection_item table
 		$query->from($db->quoteName('#__costbenefitprojection_company', 'a'));
 
 		// Filter by companies (admin sees all)
@@ -223,19 +223,19 @@ class CostbenefitprojectionModelCompanies extends JModelList
 			}
 		}
 
-		// [7558] From the users table.
+		// [7559] From the users table.
 		$query->select($db->quoteName('g.name','user_name'));
 		$query->join('LEFT', $db->quoteName('#__users', 'g') . ' ON (' . $db->quoteName('a.user') . ' = ' . $db->quoteName('g.id') . ')');
 
-		// [7558] From the costbenefitprojection_country table.
+		// [7559] From the costbenefitprojection_country table.
 		$query->select($db->quoteName('h.name','country_name'));
 		$query->join('LEFT', $db->quoteName('#__costbenefitprojection_country', 'h') . ' ON (' . $db->quoteName('a.country') . ' = ' . $db->quoteName('h.id') . ')');
 
-		// [7558] From the costbenefitprojection_service_provider table.
+		// [7559] From the costbenefitprojection_service_provider table.
 		$query->select($db->quoteName('i.user','serviceprovider_user'));
 		$query->join('LEFT', $db->quoteName('#__costbenefitprojection_service_provider', 'i') . ' ON (' . $db->quoteName('a.serviceprovider') . ' = ' . $db->quoteName('i.id') . ')');
 
-		// [7431] Filter by published state
+		// [7432] Filter by published state
 		$published = $this->getState('filter.published');
 		if (is_numeric($published))
 		{
@@ -246,21 +246,21 @@ class CostbenefitprojectionModelCompanies extends JModelList
 			$query->where('(a.published = 0 OR a.published = 1)');
 		}
 
-		// [7443] Join over the asset groups.
+		// [7444] Join over the asset groups.
 		$query->select('ag.title AS access_level');
 		$query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
-		// [7446] Filter by access level.
+		// [7447] Filter by access level.
 		if ($access = $this->getState('filter.access'))
 		{
 			$query->where('a.access = ' . (int) $access);
 		}
-		// [7451] Implement View Level Access
+		// [7452] Implement View Level Access
 		if (!$user->authorise('core.options', 'com_costbenefitprojection'))
 		{
 			$groups = implode(',', $user->getAuthorisedViewLevels());
 			$query->where('a.access IN (' . $groups . ')');
 		}
-		// [7528] Filter by search.
+		// [7529] Filter by search.
 		$search = $this->getState('filter.search');
 		if (!empty($search))
 		{
@@ -275,28 +275,28 @@ class CostbenefitprojectionModelCompanies extends JModelList
 			}
 		}
 
-		// [7771] Filter by Department.
+		// [7772] Filter by Department.
 		if ($department = $this->getState('filter.department'))
 		{
 			$query->where('a.department = ' . $db->quote($db->escape($department, true)));
 		}
-		// [7762] Filter by country.
+		// [7763] Filter by country.
 		if ($country = $this->getState('filter.country'))
 		{
 			$query->where('a.country = ' . $db->quote($db->escape($country, true)));
 		}
-		// [7762] Filter by serviceprovider.
+		// [7763] Filter by serviceprovider.
 		if ($serviceprovider = $this->getState('filter.serviceprovider'))
 		{
 			$query->where('a.serviceprovider = ' . $db->quote($db->escape($serviceprovider, true)));
 		}
-		// [7771] Filter by Per.
+		// [7772] Filter by Per.
 		if ($per = $this->getState('filter.per'))
 		{
 			$query->where('a.per = ' . $db->quote($db->escape($per, true)));
 		}
 
-		// [7487] Add the list ordering clause.
+		// [7488] Add the list ordering clause.
 		$orderCol = $this->state->get('list.ordering', 'a.id');
 		$orderDirn = $this->state->get('list.direction', 'asc');	
 		if ($orderCol != '')
@@ -314,19 +314,19 @@ class CostbenefitprojectionModelCompanies extends JModelList
 	*/
 	public function getExportData($pks)
 	{
-		// [7195] setup the query
+		// [7196] setup the query
 		if (CostbenefitprojectionHelper::checkArray($pks))
 		{
-			// [7198] Get the user object.
+			// [7199] Get the user object.
 			$user = JFactory::getUser();
-			// [7200] Create a new query object.
+			// [7201] Create a new query object.
 			$db = JFactory::getDBO();
 			$query = $db->getQuery(true);
 
-			// [7203] Select some fields
+			// [7204] Select some fields
 			$query->select('a.*');
 
-			// [7205] From the costbenefitprojection_company table
+			// [7206] From the costbenefitprojection_company table
 			$query->from($db->quoteName('#__costbenefitprojection_company', 'a'));
 			$query->where('a.id IN (' . implode(',',$pks) . ')');
 
@@ -346,32 +346,32 @@ class CostbenefitprojectionModelCompanies extends JModelList
 				$query->where('a.id = -4');
 			}
 		}
-			// [7215] Implement View Level Access
+			// [7216] Implement View Level Access
 			if (!$user->authorise('core.options', 'com_costbenefitprojection'))
 			{
 				$groups = implode(',', $user->getAuthorisedViewLevels());
 				$query->where('a.access IN (' . $groups . ')');
 			}
 
-			// [7222] Order the results by ordering
+			// [7223] Order the results by ordering
 			$query->order('a.ordering  ASC');
 
-			// [7224] Load the items
+			// [7225] Load the items
 			$db->setQuery($query);
 			$db->execute();
 			if ($db->getNumRows())
 			{
 				$items = $db->loadObjectList();
 
-				// [10868] Get the advanced encription key.
+				// [10869] Get the advanced encription key.
 				$advancedkey = CostbenefitprojectionHelper::getCryptKey('advanced');
-				// [10870] Get the encription object.
+				// [10871] Get the encription object.
 				$advanced = new FOFEncryptAes($advancedkey, 256);
 
-				// [10619] set values to display correctly.
+				// [10620] set values to display correctly.
 				if (CostbenefitprojectionHelper::checkArray($items))
 				{
-					// [10622] get user object.
+					// [10623] get user object.
 					$user = JFactory::getUser();
 					foreach ($items as $nr => &$item)
 					{
@@ -384,51 +384,51 @@ class CostbenefitprojectionModelCompanies extends JModelList
 
 						if ($advancedkey && !is_numeric($item->medical_turnovers_males) && $item->medical_turnovers_males === base64_encode(base64_decode($item->medical_turnovers_males, true)))
 						{
-							// [10762] decrypt medical_turnovers_males
+							// [10763] decrypt medical_turnovers_males
 							$item->medical_turnovers_males = $advanced->decryptString($item->medical_turnovers_males);
 						}
 						if ($advancedkey && !is_numeric($item->sick_leave_males) && $item->sick_leave_males === base64_encode(base64_decode($item->sick_leave_males, true)))
 						{
-							// [10762] decrypt sick_leave_males
+							// [10763] decrypt sick_leave_males
 							$item->sick_leave_males = $advanced->decryptString($item->sick_leave_males);
 						}
 						if ($advancedkey && !is_numeric($item->males) && $item->males === base64_encode(base64_decode($item->males, true)))
 						{
-							// [10762] decrypt males
+							// [10763] decrypt males
 							$item->males = $advanced->decryptString($item->males);
 						}
 						if ($advancedkey && !is_numeric($item->females) && $item->females === base64_encode(base64_decode($item->females, true)))
 						{
-							// [10762] decrypt females
+							// [10763] decrypt females
 							$item->females = $advanced->decryptString($item->females);
 						}
 						if ($advancedkey && !is_numeric($item->medical_turnovers_females) && $item->medical_turnovers_females === base64_encode(base64_decode($item->medical_turnovers_females, true)))
 						{
-							// [10762] decrypt medical_turnovers_females
+							// [10763] decrypt medical_turnovers_females
 							$item->medical_turnovers_females = $advanced->decryptString($item->medical_turnovers_females);
 						}
 						if ($advancedkey && !is_numeric($item->sick_leave_females) && $item->sick_leave_females === base64_encode(base64_decode($item->sick_leave_females, true)))
 						{
-							// [10762] decrypt sick_leave_females
+							// [10763] decrypt sick_leave_females
 							$item->sick_leave_females = $advanced->decryptString($item->sick_leave_females);
 						}
 						if ($advancedkey && !is_numeric($item->total_salary) && $item->total_salary === base64_encode(base64_decode($item->total_salary, true)))
 						{
-							// [10762] decrypt total_salary
+							// [10763] decrypt total_salary
 							$item->total_salary = $advanced->decryptString($item->total_salary);
 						}
 						if ($advancedkey && !is_numeric($item->total_healthcare) && $item->total_healthcare === base64_encode(base64_decode($item->total_healthcare, true)))
 						{
-							// [10762] decrypt total_healthcare
+							// [10763] decrypt total_healthcare
 							$item->total_healthcare = $advanced->decryptString($item->total_healthcare);
 						}
-						// [10832] unset the values we don't want exported.
+						// [10833] unset the values we don't want exported.
 						unset($item->asset_id);
 						unset($item->checked_out);
 						unset($item->checked_out_time);
 					}
 				}
-				// [10841] Add headers to items array.
+				// [10842] Add headers to items array.
 				$headers = $this->getExImPortHeaders();
 				if (CostbenefitprojectionHelper::checkObject($headers))
 				{
@@ -447,13 +447,13 @@ class CostbenefitprojectionModelCompanies extends JModelList
 	*/
 	public function getExImPortHeaders()
 	{
-		// [7244] Get a db connection.
+		// [7245] Get a db connection.
 		$db = JFactory::getDbo();
-		// [7246] get the columns
+		// [7247] get the columns
 		$columns = $db->getTableColumns("#__costbenefitprojection_company");
 		if (CostbenefitprojectionHelper::checkArray($columns))
 		{
-			// [7250] remove the headers you don't import/export.
+			// [7251] remove the headers you don't import/export.
 			unset($columns['asset_id']);
 			unset($columns['checked_out']);
 			unset($columns['checked_out_time']);
@@ -475,7 +475,7 @@ class CostbenefitprojectionModelCompanies extends JModelList
 	 */
 	protected function getStoreId($id = '')
 	{
-		// [10167] Compile the store id.
+		// [10168] Compile the store id.
 		$id .= ':' . $this->getState('filter.id');
 		$id .= ':' . $this->getState('filter.search');
 		$id .= ':' . $this->getState('filter.published');
@@ -500,15 +500,15 @@ class CostbenefitprojectionModelCompanies extends JModelList
 	*/
 	protected function checkInNow()
 	{
-		// [10560] Get set check in time
+		// [10561] Get set check in time
 		$time = JComponentHelper::getParams('com_costbenefitprojection')->get('check_in');
 		
 		if ($time)
 		{
 
-			// [10565] Get a db connection.
+			// [10566] Get a db connection.
 			$db = JFactory::getDbo();
-			// [10567] reset query
+			// [10568] reset query
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__costbenefitprojection_company'));
@@ -516,24 +516,24 @@ class CostbenefitprojectionModelCompanies extends JModelList
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// [10575] Get Yesterdays date
+				// [10576] Get Yesterdays date
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// [10577] reset query
+				// [10578] reset query
 				$query = $db->getQuery(true);
 
-				// [10579] Fields to update.
+				// [10580] Fields to update.
 				$fields = array(
 					$db->quoteName('checked_out_time') . '=\'0000-00-00 00:00:00\'',
 					$db->quoteName('checked_out') . '=0'
 				);
 
-				// [10584] Conditions for which records should be updated.
+				// [10585] Conditions for which records should be updated.
 				$conditions = array(
 					$db->quoteName('checked_out') . '!=0', 
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);
 
-				// [10589] Check table
+				// [10590] Check table
 				$query->update($db->quoteName('#__costbenefitprojection_company'))->set($fields)->where($conditions); 
 
 				$db->setQuery($query);
diff --git a/admin/models/company.php b/admin/models/company.php
index 74f72fe9..2ce9d6a0 100644
--- a/admin/models/company.php
+++ b/admin/models/company.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -91,60 +91,60 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 
 			if (!empty($item->causesrisks))
 			{
-				// [4004] JSON Decode causesrisks.
+				// [4005] JSON Decode causesrisks.
 				$item->causesrisks = json_decode($item->causesrisks);
 			}
 
-			// [4046] Get the advanced encription key.
+			// [4047] Get the advanced encription key.
 			$advancedkey = CostbenefitprojectionHelper::getCryptKey('advanced');
-			// [4048] Get the encription object.
+			// [4049] Get the encription object.
 			$advanced = new FOFEncryptAes($advancedkey, 256);
 
 			if (!empty($item->medical_turnovers_males) && $advancedkey && !is_numeric($item->medical_turnovers_males) && $item->medical_turnovers_males === base64_encode(base64_decode($item->medical_turnovers_males, true)))
 			{
-				// [4054] advanced decript data medical_turnovers_males.
+				// [4055] advanced decript data medical_turnovers_males.
 				$item->medical_turnovers_males = rtrim($advanced->decryptString($item->medical_turnovers_males), "\0");
 			}
 
 			if (!empty($item->sick_leave_males) && $advancedkey && !is_numeric($item->sick_leave_males) && $item->sick_leave_males === base64_encode(base64_decode($item->sick_leave_males, true)))
 			{
-				// [4054] advanced decript data sick_leave_males.
+				// [4055] advanced decript data sick_leave_males.
 				$item->sick_leave_males = rtrim($advanced->decryptString($item->sick_leave_males), "\0");
 			}
 
 			if (!empty($item->males) && $advancedkey && !is_numeric($item->males) && $item->males === base64_encode(base64_decode($item->males, true)))
 			{
-				// [4054] advanced decript data males.
+				// [4055] advanced decript data males.
 				$item->males = rtrim($advanced->decryptString($item->males), "\0");
 			}
 
 			if (!empty($item->females) && $advancedkey && !is_numeric($item->females) && $item->females === base64_encode(base64_decode($item->females, true)))
 			{
-				// [4054] advanced decript data females.
+				// [4055] advanced decript data females.
 				$item->females = rtrim($advanced->decryptString($item->females), "\0");
 			}
 
 			if (!empty($item->medical_turnovers_females) && $advancedkey && !is_numeric($item->medical_turnovers_females) && $item->medical_turnovers_females === base64_encode(base64_decode($item->medical_turnovers_females, true)))
 			{
-				// [4054] advanced decript data medical_turnovers_females.
+				// [4055] advanced decript data medical_turnovers_females.
 				$item->medical_turnovers_females = rtrim($advanced->decryptString($item->medical_turnovers_females), "\0");
 			}
 
 			if (!empty($item->sick_leave_females) && $advancedkey && !is_numeric($item->sick_leave_females) && $item->sick_leave_females === base64_encode(base64_decode($item->sick_leave_females, true)))
 			{
-				// [4054] advanced decript data sick_leave_females.
+				// [4055] advanced decript data sick_leave_females.
 				$item->sick_leave_females = rtrim($advanced->decryptString($item->sick_leave_females), "\0");
 			}
 
 			if (!empty($item->total_salary) && $advancedkey && !is_numeric($item->total_salary) && $item->total_salary === base64_encode(base64_decode($item->total_salary, true)))
 			{
-				// [4054] advanced decript data total_salary.
+				// [4055] advanced decript data total_salary.
 				$item->total_salary = rtrim($advanced->decryptString($item->total_salary), "\0");
 			}
 
 			if (!empty($item->total_healthcare) && $advancedkey && !is_numeric($item->total_healthcare) && $item->total_healthcare === base64_encode(base64_decode($item->total_healthcare, true)))
 			{
-				// [4054] advanced decript data total_healthcare.
+				// [4055] advanced decript data total_healthcare.
 				$item->total_healthcare = rtrim($advanced->decryptString($item->total_healthcare), "\0");
 			}
 			
@@ -154,8 +154,8 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 				$item->tags->getTagIds($item->id, 'com_costbenefitprojection.company');
 			}
 		}
-		$this->companyehly = $item->id;
-		$this->companynukc = $item->id;
+		$this->companyiwgy = $item->id;
+		$this->companygisn = $item->id;
 
 		return $item;
 	}
@@ -165,18 +165,18 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 	*
 	* @return mixed  An array of data items on success, false on failure.
 	*/
-	public function getOabscaling_factors()
+	public function getYosscaling_factors()
 	{
-		// [6953] Get the user object.
+		// [6954] Get the user object.
 		$user = JFactory::getUser();
-		// [6955] Create a new query object.
+		// [6956] Create a new query object.
 		$db = JFactory::getDBO();
 		$query = $db->getQuery(true);
 
-		// [6958] Select some fields
+		// [6959] Select some fields
 		$query->select('a.*');
 
-		// [6965] From the costbenefitprojection_scaling_factor table
+		// [6966] From the costbenefitprojection_scaling_factor table
 		$query->from($db->quoteName('#__costbenefitprojection_scaling_factor', 'a'));
 
 		// Filter by companies (admin sees all)
@@ -196,43 +196,43 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 			}
 		}
 
-		// [7558] From the costbenefitprojection_causerisk table.
+		// [7559] From the costbenefitprojection_causerisk table.
 		$query->select($db->quoteName('g.name','causerisk_name'));
 		$query->join('LEFT', $db->quoteName('#__costbenefitprojection_causerisk', 'g') . ' ON (' . $db->quoteName('a.causerisk') . ' = ' . $db->quoteName('g.id') . ')');
 
-		// [7558] From the costbenefitprojection_company table.
+		// [7559] From the costbenefitprojection_company table.
 		$query->select($db->quoteName('h.name','company_name'));
 		$query->join('LEFT', $db->quoteName('#__costbenefitprojection_company', 'h') . ' ON (' . $db->quoteName('a.company') . ' = ' . $db->quoteName('h.id') . ')');
 
-		// [6981] Filter by companyehly global.
-		$companyehly = $this->companyehly;
-		if (is_numeric($companyehly ))
+		// [6982] Filter by companyiwgy global.
+		$companyiwgy = $this->companyiwgy;
+		if (is_numeric($companyiwgy ))
 		{
-			$query->where('a.company = ' . (int) $companyehly );
+			$query->where('a.company = ' . (int) $companyiwgy );
 		}
-		elseif (is_string($companyehly))
+		elseif (is_string($companyiwgy))
 		{
-			$query->where('a.company = ' . $db->quote($companyehly));
+			$query->where('a.company = ' . $db->quote($companyiwgy));
 		}
 		else
 		{
 			$query->where('a.company = -5');
 		}
 
-		// [7013] Order the results by ordering
+		// [7014] Order the results by ordering
 		$query->order('a.ordering  ASC');
 
-		// [7015] Load the items
+		// [7016] Load the items
 		$db->setQuery($query);
 		$db->execute();
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [10619] set values to display correctly.
+			// [10620] set values to display correctly.
 			if (CostbenefitprojectionHelper::checkArray($items))
 			{
-				// [10622] get user object.
+				// [10623] get user object.
 				$user = JFactory::getUser();
 				foreach ($items as $nr => &$item)
 				{
@@ -255,18 +255,18 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 	*
 	* @return mixed  An array of data items on success, false on failure.
 	*/
-	public function getLjeinterventions()
+	public function getZjtinterventions()
 	{
-		// [6953] Get the user object.
+		// [6954] Get the user object.
 		$user = JFactory::getUser();
-		// [6955] Create a new query object.
+		// [6956] Create a new query object.
 		$db = JFactory::getDBO();
 		$query = $db->getQuery(true);
 
-		// [6958] Select some fields
+		// [6959] Select some fields
 		$query->select('a.*');
 
-		// [6965] From the costbenefitprojection_intervention table
+		// [6966] From the costbenefitprojection_intervention table
 		$query->from($db->quoteName('#__costbenefitprojection_intervention', 'a'));
 
 		// Filter the companies (admin sees all)
@@ -286,39 +286,39 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 			}
 		}
 
-		// [7558] From the costbenefitprojection_company table.
+		// [7559] From the costbenefitprojection_company table.
 		$query->select($db->quoteName('g.name','company_name'));
 		$query->join('LEFT', $db->quoteName('#__costbenefitprojection_company', 'g') . ' ON (' . $db->quoteName('a.company') . ' = ' . $db->quoteName('g.id') . ')');
 
-		// [6981] Filter by companynukc global.
-		$companynukc = $this->companynukc;
-		if (is_numeric($companynukc ))
+		// [6982] Filter by companygisn global.
+		$companygisn = $this->companygisn;
+		if (is_numeric($companygisn ))
 		{
-			$query->where('a.company = ' . (int) $companynukc );
+			$query->where('a.company = ' . (int) $companygisn );
 		}
-		elseif (is_string($companynukc))
+		elseif (is_string($companygisn))
 		{
-			$query->where('a.company = ' . $db->quote($companynukc));
+			$query->where('a.company = ' . $db->quote($companygisn));
 		}
 		else
 		{
 			$query->where('a.company = -5');
 		}
 
-		// [7013] Order the results by ordering
+		// [7014] Order the results by ordering
 		$query->order('a.ordering  ASC');
 
-		// [7015] Load the items
+		// [7016] Load the items
 		$db->setQuery($query);
 		$db->execute();
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [10619] set values to display correctly.
+			// [10620] set values to display correctly.
 			if (CostbenefitprojectionHelper::checkArray($items))
 			{
-				// [10622] get user object.
+				// [10623] get user object.
 				$user = JFactory::getUser();
 				foreach ($items as $nr => &$item)
 				{
@@ -345,13 +345,13 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 			}
 		} 
 
-			// [10885] set selection value to a translatable value
+			// [10886] set selection value to a translatable value
 			if (CostbenefitprojectionHelper::checkArray($items))
 			{
 				foreach ($items as $nr => &$item)
 				{
-					// [10892] convert type
-					$item->type = $this->selectionTranslationLjeinterventions($item->type, 'type');
+					// [10893] convert type
+					$item->type = $this->selectionTranslationZjtinterventions($item->type, 'type');
 				}
 			}
 
@@ -365,16 +365,16 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 	*
 	* @return translatable string
 	*/
-	public function selectionTranslationLjeinterventions($value,$name)
+	public function selectionTranslationZjtinterventions($value,$name)
 	{
-		// [10918] Array of type language strings
+		// [10919] Array of type language strings
 		if ($name == 'type')
 		{
 			$typeArray = array(
 				1 => 'COM_COSTBENEFITPROJECTION_INTERVENTION_SINGLE',
 				2 => 'COM_COSTBENEFITPROJECTION_INTERVENTION_CLUSTER'
 			);
-			// [10949] Now check if value is found in this array
+			// [10950] Now check if value is found in this array
 			if (isset($typeArray[$value]) && CostbenefitprojectionHelper::checkString($typeArray[$value]))
 			{
 				return $typeArray[$value];
@@ -394,7 +394,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 	 * @since   1.6
 	 */
 	public function getForm($data = array(), $loadData = true)
-	{		// [9574] Get the form.
+	{		// [9575] Get the form.
 		$form = $this->loadForm('com_costbenefitprojection.company', 'company', array('control' => 'jform', 'load_data' => $loadData));
 
 		if (empty($form))
@@ -404,12 +404,12 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 
 		$jinput = JFactory::getApplication()->input;
 
-		// [9659] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first.
+		// [9660] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first.
 		if ($jinput->get('a_id'))
 		{
 			$id = $jinput->get('a_id', 0, 'INT');
 		}
-		// [9664] The back end uses id so we use that the rest of the time and set it to 0 by default.
+		// [9665] The back end uses id so we use that the rest of the time and set it to 0 by default.
 		else
 		{
 			$id = $jinput->get('id', 0, 'INT');
@@ -417,207 +417,207 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 
 		$user = JFactory::getUser();
 
-		// [9670] Check for existing item.
-		// [9671] Modify the form based on Edit State access controls.
+		// [9671] Check for existing item.
+		// [9672] Modify the form based on Edit State access controls.
 		if ($id != 0 && (!$user->authorise('company.edit.state', 'com_costbenefitprojection.company.' . (int) $id))
 			|| ($id == 0 && !$user->authorise('company.edit.state', 'com_costbenefitprojection')))
 		{
-			// [9684] Disable fields for display.
+			// [9685] Disable fields for display.
 			$form->setFieldAttribute('ordering', 'disabled', 'true');
 			$form->setFieldAttribute('published', 'disabled', 'true');
-			// [9687] Disable fields while saving.
+			// [9688] Disable fields while saving.
 			$form->setFieldAttribute('ordering', 'filter', 'unset');
 			$form->setFieldAttribute('published', 'filter', 'unset');
 		}
-		// [9692] Modify the form based on Edit Creaded By access controls.
+		// [9693] Modify the form based on Edit Creaded By access controls.
 		if ($id != 0 && (!$user->authorise('company.edit.created_by', 'com_costbenefitprojection.company.' . (int) $id))
 			|| ($id == 0 && !$user->authorise('company.edit.created_by', 'com_costbenefitprojection')))
 		{
-			// [9704] Disable fields for display.
+			// [9705] Disable fields for display.
 			$form->setFieldAttribute('created_by', 'disabled', 'true');
-			// [9706] Disable fields for display.
+			// [9707] Disable fields for display.
 			$form->setFieldAttribute('created_by', 'readonly', 'true');
-			// [9708] Disable fields while saving.
+			// [9709] Disable fields while saving.
 			$form->setFieldAttribute('created_by', 'filter', 'unset');
 		}
-		// [9711] Modify the form based on Edit Creaded Date access controls.
+		// [9712] Modify the form based on Edit Creaded Date access controls.
 		if ($id != 0 && (!$user->authorise('company.edit.created', 'com_costbenefitprojection.company.' . (int) $id))
 			|| ($id == 0 && !$user->authorise('company.edit.created', 'com_costbenefitprojection')))
 		{
-			// [9723] Disable fields for display.
+			// [9724] Disable fields for display.
 			$form->setFieldAttribute('created', 'disabled', 'true');
-			// [9725] Disable fields while saving.
+			// [9726] Disable fields while saving.
 			$form->setFieldAttribute('created', 'filter', 'unset');
 		}
-		// [9733] Modify the form based on Edit Email access controls.
+		// [9734] Modify the form based on Edit Email access controls.
 		if ($id != 0 && (!$user->authorise('company.edit.email', 'com_costbenefitprojection.company.' . (int) $id))
 			|| ($id == 0 && !$user->authorise('company.edit.email', 'com_costbenefitprojection')))
 		{
-			// [9737] Disable fields for display.
+			// [9738] Disable fields for display.
 			$form->setFieldAttribute('email', 'disabled', 'true');
-			// [9739] Disable fields for display.
+			// [9740] Disable fields for display.
 			$form->setFieldAttribute('email', 'readonly', 'true');
 			if (!$form->getValue('email'))
 			{
-				// [9749] Disable fields while saving.
+				// [9750] Disable fields while saving.
 				$form->setFieldAttribute('email', 'filter', 'unset');
-				// [9751] Disable fields while saving.
+				// [9752] Disable fields while saving.
 				$form->setFieldAttribute('email', 'required', 'false');
 			}
 		}
-		// [9733] Modify the form based on Edit User access controls.
+		// [9734] Modify the form based on Edit User access controls.
 		if ($id != 0 && (!$user->authorise('company.edit.user', 'com_costbenefitprojection.company.' . (int) $id))
 			|| ($id == 0 && !$user->authorise('company.edit.user', 'com_costbenefitprojection')))
 		{
-			// [9737] Disable fields for display.
+			// [9738] Disable fields for display.
 			$form->setFieldAttribute('user', 'disabled', 'true');
-			// [9739] Disable fields for display.
+			// [9740] Disable fields for display.
 			$form->setFieldAttribute('user', 'readonly', 'true');
 			if (!$form->getValue('user'))
 			{
-				// [9749] Disable fields while saving.
+				// [9750] Disable fields while saving.
 				$form->setFieldAttribute('user', 'filter', 'unset');
-				// [9751] Disable fields while saving.
+				// [9752] Disable fields while saving.
 				$form->setFieldAttribute('user', 'required', 'false');
 			}
 		}
-		// [9733] Modify the form based on Edit Department access controls.
+		// [9734] Modify the form based on Edit Department access controls.
 		if ($id != 0 && (!$user->authorise('company.edit.department', 'com_costbenefitprojection.company.' . (int) $id))
 			|| ($id == 0 && !$user->authorise('company.edit.department', 'com_costbenefitprojection')))
 		{
-			// [9737] Disable fields for display.
+			// [9738] Disable fields for display.
 			$form->setFieldAttribute('department', 'disabled', 'true');
-			// [9739] Disable fields for display.
+			// [9740] Disable fields for display.
 			$form->setFieldAttribute('department', 'readonly', 'true');
-			// [9743] Disable radio button for display.
+			// [9744] Disable radio button for display.
 			$class = $form->getFieldAttribute('department', 'class', '');
 			$form->setFieldAttribute('department', 'class', $class.' disabled no-click');
 			if (!$form->getValue('department'))
 			{
-				// [9749] Disable fields while saving.
+				// [9750] Disable fields while saving.
 				$form->setFieldAttribute('department', 'filter', 'unset');
-				// [9751] Disable fields while saving.
+				// [9752] Disable fields while saving.
 				$form->setFieldAttribute('department', 'required', 'false');
 			}
 		}
-		// [9733] Modify the form based on Edit Country access controls.
+		// [9734] Modify the form based on Edit Country access controls.
 		if ($id != 0 && (!$user->authorise('company.edit.country', 'com_costbenefitprojection.company.' . (int) $id))
 			|| ($id == 0 && !$user->authorise('company.edit.country', 'com_costbenefitprojection')))
 		{
-			// [9737] Disable fields for display.
+			// [9738] Disable fields for display.
 			$form->setFieldAttribute('country', 'disabled', 'true');
-			// [9739] Disable fields for display.
+			// [9740] Disable fields for display.
 			$form->setFieldAttribute('country', 'readonly', 'true');
 			if (!$form->getValue('country'))
 			{
-				// [9749] Disable fields while saving.
+				// [9750] Disable fields while saving.
 				$form->setFieldAttribute('country', 'filter', 'unset');
-				// [9751] Disable fields while saving.
+				// [9752] Disable fields while saving.
 				$form->setFieldAttribute('country', 'required', 'false');
 			}
 		}
-		// [9733] Modify the form based on Edit Serviceprovider access controls.
+		// [9734] Modify the form based on Edit Serviceprovider access controls.
 		if ($id != 0 && (!$user->authorise('company.edit.serviceprovider', 'com_costbenefitprojection.company.' . (int) $id))
 			|| ($id == 0 && !$user->authorise('company.edit.serviceprovider', 'com_costbenefitprojection')))
 		{
-			// [9737] Disable fields for display.
+			// [9738] Disable fields for display.
 			$form->setFieldAttribute('serviceprovider', 'disabled', 'true');
-			// [9739] Disable fields for display.
+			// [9740] Disable fields for display.
 			$form->setFieldAttribute('serviceprovider', 'readonly', 'true');
 			if (!$form->getValue('serviceprovider'))
 			{
-				// [9749] Disable fields while saving.
+				// [9750] Disable fields while saving.
 				$form->setFieldAttribute('serviceprovider', 'filter', 'unset');
-				// [9751] Disable fields while saving.
+				// [9752] Disable fields while saving.
 				$form->setFieldAttribute('serviceprovider', 'required', 'false');
 			}
 		}
-		// [9733] Modify the form based on Edit Per access controls.
+		// [9734] Modify the form based on Edit Per access controls.
 		if ($id != 0 && (!$user->authorise('company.edit.per', 'com_costbenefitprojection.company.' . (int) $id))
 			|| ($id == 0 && !$user->authorise('company.edit.per', 'com_costbenefitprojection')))
 		{
-			// [9737] Disable fields for display.
+			// [9738] Disable fields for display.
 			$form->setFieldAttribute('per', 'disabled', 'true');
-			// [9739] Disable fields for display.
+			// [9740] Disable fields for display.
 			$form->setFieldAttribute('per', 'readonly', 'true');
-			// [9743] Disable radio button for display.
+			// [9744] Disable radio button for display.
 			$class = $form->getFieldAttribute('per', 'class', '');
 			$form->setFieldAttribute('per', 'class', $class.' disabled no-click');
 			if (!$form->getValue('per'))
 			{
-				// [9749] Disable fields while saving.
+				// [9750] Disable fields while saving.
 				$form->setFieldAttribute('per', 'filter', 'unset');
-				// [9751] Disable fields while saving.
+				// [9752] Disable fields while saving.
 				$form->setFieldAttribute('per', 'required', 'false');
 			}
 		}
-		// [9733] Modify the form based on Edit Causesrisks access controls.
+		// [9734] Modify the form based on Edit Causesrisks access controls.
 		if ($id != 0 && (!$user->authorise('company.edit.causesrisks', 'com_costbenefitprojection.company.' . (int) $id))
 			|| ($id == 0 && !$user->authorise('company.edit.causesrisks', 'com_costbenefitprojection')))
 		{
-			// [9737] Disable fields for display.
+			// [9738] Disable fields for display.
 			$form->setFieldAttribute('causesrisks', 'disabled', 'true');
-			// [9739] Disable fields for display.
+			// [9740] Disable fields for display.
 			$form->setFieldAttribute('causesrisks', 'readonly', 'true');
 			if (!$form->getValue('causesrisks'))
 			{
-				// [9749] Disable fields while saving.
+				// [9750] Disable fields while saving.
 				$form->setFieldAttribute('causesrisks', 'filter', 'unset');
-				// [9751] Disable fields while saving.
+				// [9752] Disable fields while saving.
 				$form->setFieldAttribute('causesrisks', 'required', 'false');
 			}
 		}
-		// [9733] Modify the form based on Edit Percentfemale access controls.
+		// [9734] Modify the form based on Edit Percentfemale access controls.
 		if ($id != 0 && (!$user->authorise('company.edit.percentfemale', 'com_costbenefitprojection.company.' . (int) $id))
 			|| ($id == 0 && !$user->authorise('company.edit.percentfemale', 'com_costbenefitprojection')))
 		{
-			// [9737] Disable fields for display.
+			// [9738] Disable fields for display.
 			$form->setFieldAttribute('percentfemale', 'disabled', 'true');
-			// [9739] Disable fields for display.
+			// [9740] Disable fields for display.
 			$form->setFieldAttribute('percentfemale', 'readonly', 'true');
-			// [9743] Disable radio button for display.
+			// [9744] Disable radio button for display.
 			$class = $form->getFieldAttribute('percentfemale', 'class', '');
 			$form->setFieldAttribute('percentfemale', 'class', $class.' disabled no-click');
 			if (!$form->getValue('percentfemale'))
 			{
-				// [9749] Disable fields while saving.
+				// [9750] Disable fields while saving.
 				$form->setFieldAttribute('percentfemale', 'filter', 'unset');
-				// [9751] Disable fields while saving.
+				// [9752] Disable fields while saving.
 				$form->setFieldAttribute('percentfemale', 'required', 'false');
 			}
 		}
-		// [9733] Modify the form based on Edit Datayear access controls.
+		// [9734] Modify the form based on Edit Datayear access controls.
 		if ($id != 0 && (!$user->authorise('company.edit.datayear', 'com_costbenefitprojection.company.' . (int) $id))
 			|| ($id == 0 && !$user->authorise('company.edit.datayear', 'com_costbenefitprojection')))
 		{
-			// [9737] Disable fields for display.
+			// [9738] Disable fields for display.
 			$form->setFieldAttribute('datayear', 'disabled', 'true');
-			// [9739] Disable fields for display.
+			// [9740] Disable fields for display.
 			$form->setFieldAttribute('datayear', 'readonly', 'true');
 			if (!$form->getValue('datayear'))
 			{
-				// [9749] Disable fields while saving.
+				// [9750] Disable fields while saving.
 				$form->setFieldAttribute('datayear', 'filter', 'unset');
-				// [9751] Disable fields while saving.
+				// [9752] Disable fields while saving.
 				$form->setFieldAttribute('datayear', 'required', 'false');
 			}
 		}
-		// [9733] Modify the form based on Edit Percentmale access controls.
+		// [9734] Modify the form based on Edit Percentmale access controls.
 		if ($id != 0 && (!$user->authorise('company.edit.percentmale', 'com_costbenefitprojection.company.' . (int) $id))
 			|| ($id == 0 && !$user->authorise('company.edit.percentmale', 'com_costbenefitprojection')))
 		{
-			// [9737] Disable fields for display.
+			// [9738] Disable fields for display.
 			$form->setFieldAttribute('percentmale', 'disabled', 'true');
-			// [9739] Disable fields for display.
+			// [9740] Disable fields for display.
 			$form->setFieldAttribute('percentmale', 'readonly', 'true');
-			// [9743] Disable radio button for display.
+			// [9744] Disable radio button for display.
 			$class = $form->getFieldAttribute('percentmale', 'class', '');
 			$form->setFieldAttribute('percentmale', 'class', $class.' disabled no-click');
 			if (!$form->getValue('percentmale'))
 			{
-				// [9749] Disable fields while saving.
+				// [9750] Disable fields while saving.
 				$form->setFieldAttribute('percentmale', 'filter', 'unset');
-				// [9751] Disable fields while saving.
+				// [9752] Disable fields while saving.
 				$form->setFieldAttribute('percentmale', 'required', 'false');
 			}
 		}
@@ -654,7 +654,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 			}
 
 			$user = JFactory::getUser();
-			// [9875] The record has been set. Check the record permissions.
+			// [9876] The record has been set. Check the record permissions.
 			return $user->authorise('company.delete', 'com_costbenefitprojection.company.' . (int) $record->id);
 		}
 		return false;
@@ -676,14 +676,14 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 
 		if ($recordId)
 		{
-			// [9962] The record has been set. Check the record permissions.
+			// [9963] The record has been set. Check the record permissions.
 			$permission = $user->authorise('company.edit.state', 'com_costbenefitprojection.company.' . (int) $recordId);
 			if (!$permission && !is_null($permission))
 			{
 				return false;
 			}
 		}
-		// [9979] In the absense of better information, revert to the component permissions.
+		// [9980] In the absense of better information, revert to the component permissions.
 		return $user->authorise('company.edit.state', 'com_costbenefitprojection');
 	}
     
@@ -698,7 +698,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 	 */
 	protected function allowEdit($data = array(), $key = 'id')
 	{
-		// [9787] Check specific edit permission then general edit permission.
+		// [9788] Check specific edit permission then general edit permission.
 		$user = JFactory::getUser();
 		$recordId	= (int) isset($data[$key]) ? $data[$key] : 0;
 		if (!$user->authorise('core.options', 'com_costbenefitprojection'))
@@ -813,20 +813,20 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 	*/
 	public function validate($form, $data, $group = null)
 	{
-		// [8778] check if the not_required field is set
+		// [8779] check if the not_required field is set
 		if (CostbenefitprojectionHelper::checkString($data['not_required']))
 		{
 			$requiredFields = (array) explode(',',(string) $data['not_required']);
 			$requiredFields = array_unique($requiredFields);
-			// [8783] now change the required field attributes value
+			// [8784] now change the required field attributes value
 			foreach ($requiredFields as $requiredField)
 			{
-				// [8786] make sure there is a string value
+				// [8787] make sure there is a string value
 				if (CostbenefitprojectionHelper::checkString($requiredField))
 				{
-					// [8789] change to false
+					// [8790] change to false
 					$form->setFieldAttribute($requiredField, 'required', 'false');
-					// [8791] also clear the data set
+					// [8792] also clear the data set
 					$data[$requiredField] = '';
 				}
 			}
@@ -957,7 +957,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 	{
 		if (empty($this->batchSet))
 		{
-			// [4940] Set some needed variables.
+			// [4941] Set some needed variables.
 			$this->user 		= JFactory::getUser();
 			$this->table 		= $this->getTable();
 			$this->tableClassName	= get_class($this->table);
@@ -1000,12 +1000,12 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 			}
 		}
 
-		// [4960] get list of uniqe fields
+		// [4961] get list of uniqe fields
 		$uniqeFields = $this->getUniqeFields();
-		// [4962] remove move_copy from array
+		// [4963] remove move_copy from array
 		unset($values['move_copy']);
 
-		// [4965] make sure published is set
+		// [4966] make sure published is set
 		if (!isset($values['published']))
 		{
 			$values['published'] = 0;
@@ -1017,21 +1017,21 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 
 		$newIds = array();
 
-		// [5002] Parent exists so let's proceed
+		// [5003] Parent exists so let's proceed
 		while (!empty($pks))
 		{
-			// [5005] Pop the first ID off the stack
+			// [5006] Pop the first ID off the stack
 			$pk = array_shift($pks);
 
 			$this->table->reset();
 
-			// [5010] only allow copy if user may edit this item.
+			// [5011] only allow copy if user may edit this item.
 
 			if (!$this->user->authorise('company.edit', $contexts[$pk]))
 
 			{
 
-				// [5020] Not fatal error
+				// [5021] Not fatal error
 
 				$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 
@@ -1039,19 +1039,19 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 
 			}
 
-			// [5025] Check that the row actually exists
+			// [5026] Check that the row actually exists
 			if (!$this->table->load($pk))
 			{
 				if ($error = $this->table->getError())
 				{
-					// [5030] Fatal error
+					// [5031] Fatal error
 					$this->setError($error);
 
 					return false;
 				}
 				else
 				{
-					// [5037] Not fatal error
+					// [5038] Not fatal error
 					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 					continue;
 				}
@@ -1059,7 +1059,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 
 			$this->table->name = $this->generateUniqe('name',$this->table->name);
 
-			// [5073] insert all set values
+			// [5074] insert all set values
 			if (CostbenefitprojectionHelper::checkArray($values))
 			{
 				foreach ($values as $key => $value)
@@ -1071,7 +1071,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 				}
 			}
 
-			// [5085] update all uniqe fields
+			// [5086] update all uniqe fields
 			if (CostbenefitprojectionHelper::checkArray($uniqeFields))
 			{
 				foreach ($uniqeFields as $uniqeField)
@@ -1080,13 +1080,13 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 				}
 			}
 
-			// [5094] Reset the ID because we are making a copy
+			// [5095] Reset the ID because we are making a copy
 			$this->table->id = 0;
 
-			// [5097] TODO: Deal with ordering?
-			// [5098] $this->table->ordering	= 1;
+			// [5098] TODO: Deal with ordering?
+			// [5099] $this->table->ordering	= 1;
 
-			// [5100] Check the row.
+			// [5101] Check the row.
 			if (!$this->table->check())
 			{
 				$this->setError($this->table->getError());
@@ -1099,7 +1099,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 				$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
 			}
 
-			// [5113] Store the row.
+			// [5114] Store the row.
 			if (!$this->table->store())
 			{
 				$this->setError($this->table->getError());
@@ -1107,14 +1107,14 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 				return false;
 			}
 
-			// [5121] Get the new item ID
+			// [5122] Get the new item ID
 			$newId = $this->table->get('id');
 
-			// [5124] Add the new ID to the array
+			// [5125] Add the new ID to the array
 			$newIds[$pk] = $newId;
 		}
 
-		// [5128] Clean the cache
+		// [5129] Clean the cache
 		$this->cleanCache();
 
 		return $newIds;
@@ -1135,7 +1135,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 	{
 		if (empty($this->batchSet))
 		{
-			// [4742] Set some needed variables.
+			// [4743] Set some needed variables.
 			$this->user		= JFactory::getUser();
 			$this->table		= $this->getTable();
 			$this->tableClassName	= get_class($this->table);
@@ -1179,15 +1179,15 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 			}
 		}
 
-		// [4764] make sure published only updates if user has the permission.
+		// [4765] make sure published only updates if user has the permission.
 		if (isset($values['published']) && !$this->canDo->get('company.edit.state'))
 		{
 			unset($values['published']);
 		}
-		// [4777] remove move_copy from array
+		// [4778] remove move_copy from array
 		unset($values['move_copy']);
 
-		// [4798] Parent exists so we proceed
+		// [4799] Parent exists so we proceed
 		foreach ($pks as $pk)
 		{
 			if (!$this->user->authorise('company.edit', $contexts[$pk]))
@@ -1197,30 +1197,30 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 				return false;
 			}
 
-			// [4815] Check that the row actually exists
+			// [4816] Check that the row actually exists
 			if (!$this->table->load($pk))
 			{
 				if ($error = $this->table->getError())
 				{
-					// [4820] Fatal error
+					// [4821] Fatal error
 					$this->setError($error);
 
 					return false;
 				}
 				else
 				{
-					// [4827] Not fatal error
+					// [4828] Not fatal error
 					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 					continue;
 				}
 			}
 
-			// [4833] insert all set values.
+			// [4834] insert all set values.
 			if (CostbenefitprojectionHelper::checkArray($values))
 			{
 				foreach ($values as $key => $value)
 				{
-					// [4838] Do special action for access.
+					// [4839] Do special action for access.
 					if ('access' == $key && strlen($value) > 0)
 					{
 						$this->table->$key = $value;
@@ -1233,7 +1233,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 			}
 
 
-			// [4850] Check the row.
+			// [4851] Check the row.
 			if (!$this->table->check())
 			{
 				$this->setError($this->table->getError());
@@ -1246,7 +1246,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 				$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
 			}
 
-			// [4863] Store the row.
+			// [4864] Store the row.
 			if (!$this->table->store())
 			{
 				$this->setError($this->table->getError());
@@ -1255,7 +1255,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 			}
 		}
 
-		// [4872] Clean the cache
+		// [4873] Clean the cache
 		$this->cleanCache();
 
 		return true;
@@ -1285,60 +1285,60 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 			$data['metadata'] = (string) $metadata;
 		} 
 
-		// [4114] Set the causesrisks string to JSON string.
+		// [4115] Set the causesrisks string to JSON string.
 		if (isset($data['causesrisks']))
 		{
 			$data['causesrisks'] = (string) json_encode($data['causesrisks']);
 		}
 
-		// [4154] Get the advanced encription key.
+		// [4155] Get the advanced encription key.
 		$advancedkey = CostbenefitprojectionHelper::getCryptKey('advanced');
-		// [4156] Get the encription object
+		// [4157] Get the encription object
 		$advanced = new FOFEncryptAes($advancedkey, 256);
 
-		// [4160] Encript data medical_turnovers_males.
+		// [4161] Encript data medical_turnovers_males.
 		if (isset($data['medical_turnovers_males']) && $advancedkey)
 		{
 			$data['medical_turnovers_males'] = $advanced->encryptString($data['medical_turnovers_males']);
 		}
 
-		// [4160] Encript data sick_leave_males.
+		// [4161] Encript data sick_leave_males.
 		if (isset($data['sick_leave_males']) && $advancedkey)
 		{
 			$data['sick_leave_males'] = $advanced->encryptString($data['sick_leave_males']);
 		}
 
-		// [4160] Encript data males.
+		// [4161] Encript data males.
 		if (isset($data['males']) && $advancedkey)
 		{
 			$data['males'] = $advanced->encryptString($data['males']);
 		}
 
-		// [4160] Encript data females.
+		// [4161] Encript data females.
 		if (isset($data['females']) && $advancedkey)
 		{
 			$data['females'] = $advanced->encryptString($data['females']);
 		}
 
-		// [4160] Encript data medical_turnovers_females.
+		// [4161] Encript data medical_turnovers_females.
 		if (isset($data['medical_turnovers_females']) && $advancedkey)
 		{
 			$data['medical_turnovers_females'] = $advanced->encryptString($data['medical_turnovers_females']);
 		}
 
-		// [4160] Encript data sick_leave_females.
+		// [4161] Encript data sick_leave_females.
 		if (isset($data['sick_leave_females']) && $advancedkey)
 		{
 			$data['sick_leave_females'] = $advanced->encryptString($data['sick_leave_females']);
 		}
 
-		// [4160] Encript data total_salary.
+		// [4161] Encript data total_salary.
 		if (isset($data['total_salary']) && $advancedkey)
 		{
 			$data['total_salary'] = $advanced->encryptString($data['total_salary']);
 		}
 
-		// [4160] Encript data total_healthcare.
+		// [4161] Encript data total_healthcare.
 		if (isset($data['total_healthcare']) && $advancedkey)
 		{
 			$data['total_healthcare'] = $advanced->encryptString($data['total_healthcare']);
@@ -1359,10 +1359,10 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 			$data['params'] = (string) $params;
 		}
 
-		// [5220] Alter the uniqe field for save as copy
+		// [5221] Alter the uniqe field for save as copy
 		if ($input->get('task') == 'save2copy')
 		{
-			// [5223] Automatic handling of other uniqe fields
+			// [5224] Automatic handling of other uniqe fields
 			$uniqeFields = $this->getUniqeFields();
 			if (CostbenefitprojectionHelper::checkArray($uniqeFields))
 			{
@@ -1415,7 +1415,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 	protected function _generateNewTitle($title)
 	{
 
-		// [5278] Alter the title
+		// [5279] Alter the title
 		$table = $this->getTable();
 
 		while ($table->load(array('title' => $title)))
diff --git a/admin/models/companyresults.php b/admin/models/companyresults.php
index 54f24f69..6f305f03 100644
--- a/admin/models/companyresults.php
+++ b/admin/models/companyresults.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -133,14 +133,14 @@ class CostbenefitprojectionModelCompanyresults extends JModelItem
 			try
 			{
 
-				// [2434] Get the advanced encription.
+				// [2435] Get the advanced encription.
 				$advancedkey = CostbenefitprojectionHelper::getCryptKey('advanced');
-				// [2436] Get the encription object.
+				// [2437] Get the encription object.
 				$advanced = new FOFEncryptAes($advancedkey, 256);
-				// [2340] Get a db connection.
+				// [2341] Get a db connection.
 				$db = JFactory::getDbo();
 
-				// [2342] Create a new query object.
+				// [2343] Create a new query object.
 				$query = $db->getQuery(true);
 
 				// [1791] Get from #__costbenefitprojection_company as a
@@ -162,94 +162,94 @@ class CostbenefitprojectionModelCompanyresults extends JModelItem
 				$query->join('LEFT', ($db->quoteName('#__costbenefitprojection_currency', 'f')) . ' ON (' . $db->quoteName('e.currency') . ' = ' . $db->quoteName('f.codethree') . ')');
 				$query->where('a.id = ' . (int) $pk);
 
-				// [2353] Reset the query using our newly populated query object.
+				// [2354] Reset the query using our newly populated query object.
 				$db->setQuery($query);
-				// [2355] Load the results as a stdClass object.
+				// [2356] Load the results as a stdClass object.
 				$data = $db->loadObject();
 
 				if (empty($data))
 				{
-					// [2366] If no data is found redirect to default page and show warning.
+					// [2367] If no data is found redirect to default page and show warning.
 					JError::raiseWarning(500, JText::_('COM_COSTBENEFITPROJECTION_NOT_FOUND_OR_ACCESS_DENIED'));
 					JFactory::getApplication()->redirect('index.php?option=com_costbenefitprojection');
 					return false;
 				}
 				if (!empty($data->medical_turnovers_males) && $advancedkey && !is_numeric($data->medical_turnovers_males) && $data->medical_turnovers_males === base64_encode(base64_decode($data->medical_turnovers_males, true)))
 				{
-					// [1997] Decode medical_turnovers_males
+					// [1993] Decode medical_turnovers_males
 					$data->medical_turnovers_males = rtrim($advanced->decryptString($data->medical_turnovers_males), "\0");
 				}
 				if (!empty($data->sick_leave_males) && $advancedkey && !is_numeric($data->sick_leave_males) && $data->sick_leave_males === base64_encode(base64_decode($data->sick_leave_males, true)))
 				{
-					// [1997] Decode sick_leave_males
+					// [1993] Decode sick_leave_males
 					$data->sick_leave_males = rtrim($advanced->decryptString($data->sick_leave_males), "\0");
 				}
 				if (!empty($data->males) && $advancedkey && !is_numeric($data->males) && $data->males === base64_encode(base64_decode($data->males, true)))
 				{
-					// [1997] Decode males
+					// [1993] Decode males
 					$data->males = rtrim($advanced->decryptString($data->males), "\0");
 				}
 				if (CostbenefitprojectionHelper::checkString($data->causesrisks))
 				{
-					// [1997] Decode causesrisks
+					// [1993] Decode causesrisks
 					$data->causesrisks = json_decode($data->causesrisks, true);
 				}
 				if (!empty($data->females) && $advancedkey && !is_numeric($data->females) && $data->females === base64_encode(base64_decode($data->females, true)))
 				{
-					// [1997] Decode females
+					// [1993] Decode females
 					$data->females = rtrim($advanced->decryptString($data->females), "\0");
 				}
 				if (!empty($data->medical_turnovers_females) && $advancedkey && !is_numeric($data->medical_turnovers_females) && $data->medical_turnovers_females === base64_encode(base64_decode($data->medical_turnovers_females, true)))
 				{
-					// [1997] Decode medical_turnovers_females
+					// [1993] Decode medical_turnovers_females
 					$data->medical_turnovers_females = rtrim($advanced->decryptString($data->medical_turnovers_females), "\0");
 				}
 				if (!empty($data->sick_leave_females) && $advancedkey && !is_numeric($data->sick_leave_females) && $data->sick_leave_females === base64_encode(base64_decode($data->sick_leave_females, true)))
 				{
-					// [1997] Decode sick_leave_females
+					// [1993] Decode sick_leave_females
 					$data->sick_leave_females = rtrim($advanced->decryptString($data->sick_leave_females), "\0");
 				}
 				if (!empty($data->total_salary) && $advancedkey && !is_numeric($data->total_salary) && $data->total_salary === base64_encode(base64_decode($data->total_salary, true)))
 				{
-					// [1997] Decode total_salary
+					// [1993] Decode total_salary
 					$data->total_salary = rtrim($advanced->decryptString($data->total_salary), "\0");
 				}
 				if (!empty($data->total_healthcare) && $advancedkey && !is_numeric($data->total_healthcare) && $data->total_healthcare === base64_encode(base64_decode($data->total_healthcare, true)))
 				{
-					// [1997] Decode total_healthcare
+					// [1993] Decode total_healthcare
 					$data->total_healthcare = rtrim($advanced->decryptString($data->total_healthcare), "\0");
 				}
 				if (CostbenefitprojectionHelper::checkString($data->country_causesrisks))
 				{
-					// [1997] Decode country_causesrisks
+					// [1993] Decode country_causesrisks
 					$data->country_causesrisks = json_decode($data->country_causesrisks, true);
 				}
-				// [2012] Make sure the content prepare plugins fire on country_publicaddress.
+				// [2008] Make sure the content prepare plugins fire on country_publicaddress.
 				$data->country_publicaddress = JHtml::_('content.prepare',$data->country_publicaddress);
-				// [2014] Checking if country_publicaddress has uikit components that must be loaded.
+				// [2010] Checking if country_publicaddress has uikit components that must be loaded.
 				$this->uikitComp = CostbenefitprojectionHelper::getUikitComp($data->country_publicaddress,$this->uikitComp);
-				// [2312] set the global causesrisks value.
+				// [2313] set the global causesrisks value.
 				$this->a_causesrisks = $data->causesrisks;
-				// [2312] set the global datayear value.
+				// [2313] set the global datayear value.
 				$this->a_datayear = $data->datayear;
-				// [2312] set the global datayear value.
+				// [2313] set the global datayear value.
 				$this->e_datayear = $data->country_datayear;
-				// [2312] set the global causesrisks value.
+				// [2313] set the global causesrisks value.
 				$this->e_causesrisks = $data->country_causesrisks;
-				// [2045] set countryCountryHealth_dataB to the $data object.
+				// [2041] set countryCountryHealth_dataB to the $data object.
 				$data->countryCountryHealth_dataB = $this->getCountryCountryHealth_dataEbbe_B($data->country);
-				// [2045] set idCompanyScaling_factorC to the $data object.
+				// [2041] set idCompanyScaling_factorC to the $data object.
 				$data->idCompanyScaling_factorC = $this->getIdCompanyScaling_factorEbbe_C($data->id);
-				// [2045] set idCompanyInterventionD to the $data object.
+				// [2041] set idCompanyInterventionD to the $data object.
 				$data->idCompanyInterventionD = $this->getIdCompanyInterventionEbbe_D($data->id);
-				// [2045] set causesrisksIdCauseriskG to the $data object.
+				// [2041] set causesrisksIdCauseriskG to the $data object.
 				$data->causesrisksIdCauseriskG = $this->getCausesrisksIdCauseriskEbbe_G($data->causesrisks);
-				// [2045] set countryCountryHealth_dataBB to the $data object.
+				// [2041] set countryCountryHealth_dataBB to the $data object.
 				$data->countryCountryHealth_dataBB = $this->getCountryCountryHealth_dataEbbe_BB($data->country);
-				// [2045] set causesrisksIdCauseriskGG to the $data object.
+				// [2041] set causesrisksIdCauseriskGG to the $data object.
 				$data->causesrisksIdCauseriskGG = $this->getCausesrisksIdCauseriskEbbe_GG($data->country_causesrisks);
 
-				// [2460] set data object to item.
+				// [2461] set data object to item.
 				$this->_item[$pk] = $data;
                         }
 			catch (Exception $e)
@@ -278,19 +278,19 @@ class CostbenefitprojectionModelCompanyresults extends JModelItem
 	*/
 	public function getCountryCountryHealth_dataEbbe_B($country)
 	{
-		// [2710] Get a db connection.
+		// [2711] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2712] Create a new query object.
+		// [2713] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2714] Get from #__costbenefitprojection_health_data as b
+		// [2715] Get from #__costbenefitprojection_health_data as b
 		$query->select($db->quoteName(
 			array('b.id','b.causerisk','b.year','b.maledeath','b.maleyld','b.femaledeath','b.femaleyld','b.published'),
 			array('id','causerisk','year','maledeath','maleyld','femaledeath','femaleyld','published')));
 		$query->from($db->quoteName('#__costbenefitprojection_health_data', 'b'));
 		$query->where('b.country = ' . $db->quote($country));
-				// [2127] Check if $this->a_causesrisks is an array with values.
+				// [2123] Check if $this->a_causesrisks is an array with values.
 				$array = $this->a_causesrisks;
 				if (isset($array) && CostbenefitprojectionHelper::checkArray($array))
 				{
@@ -304,11 +304,11 @@ class CostbenefitprojectionModelCompanyresults extends JModelItem
 		$query->where('b.year = ' . $db->quote($this->a_datayear));
 		$query->order('b.ordering ASC');
 
-		// [2768] Reset the query using our newly populated query object.
+		// [2769] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2771] check if there was data returned
+		// [2772] check if there was data returned
 		if ($db->getNumRows())
 		{
 			return $db->loadObjectList();
@@ -324,13 +324,13 @@ class CostbenefitprojectionModelCompanyresults extends JModelItem
 	*/
 	public function getIdCompanyScaling_factorEbbe_C($id)
 	{
-		// [2710] Get a db connection.
+		// [2711] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2712] Create a new query object.
+		// [2713] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2714] Get from #__costbenefitprojection_scaling_factor as c
+		// [2715] Get from #__costbenefitprojection_scaling_factor as c
 		$query->select($db->quoteName(
 			array('c.id','c.causerisk','c.reference','c.yld_scaling_factor_males','c.yld_scaling_factor_females','c.mortality_scaling_factor_males','c.mortality_scaling_factor_females','c.presenteeism_scaling_factor_males','c.presenteeism_scaling_factor_females','c.health_scaling_factor','c.published'),
 			array('id','causerisk','reference','yld_scaling_factor_males','yld_scaling_factor_females','mortality_scaling_factor_males','mortality_scaling_factor_females','presenteeism_scaling_factor_males','presenteeism_scaling_factor_females','health_scaling_factor','published')));
@@ -339,21 +339,21 @@ class CostbenefitprojectionModelCompanyresults extends JModelItem
 		$query->where('c.published = 1');
 		$query->order('c.ordering ASC');
 
-		// [2768] Reset the query using our newly populated query object.
+		// [2769] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2771] check if there was data returned
+		// [2772] check if there was data returned
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [2824] Convert the parameter fields into objects.
+			// [2825] Convert the parameter fields into objects.
 			foreach ($items as $nr => &$item)
 			{
-				// [2012] Make sure the content prepare plugins fire on reference.
+				// [2008] Make sure the content prepare plugins fire on reference.
 				$item->reference = JHtml::_('content.prepare',$item->reference);
-				// [2014] Checking if reference has uikit components that must be loaded.
+				// [2010] Checking if reference has uikit components that must be loaded.
 				$this->uikitComp = CostbenefitprojectionHelper::getUikitComp($item->reference,$this->uikitComp);
 			}
 			return $items;
@@ -369,13 +369,13 @@ class CostbenefitprojectionModelCompanyresults extends JModelItem
 	*/
 	public function getIdCompanyInterventionEbbe_D($id)
 	{
-		// [2710] Get a db connection.
+		// [2711] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2712] Create a new query object.
+		// [2713] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2714] Get from #__costbenefitprojection_intervention as d
+		// [2715] Get from #__costbenefitprojection_intervention as d
 		$query->select($db->quoteName(
 			array('d.id','d.name','d.type','d.coverage','d.duration','d.share','d.description','d.reference','d.intervention','d.published','d.created_by','d.modified_by','d.created','d.modified'),
 			array('id','name','type','coverage','duration','share','description','reference','intervention','published','created_by','modified_by','created','modified')));
@@ -384,25 +384,25 @@ class CostbenefitprojectionModelCompanyresults extends JModelItem
 		$query->where('d.published = 1');
 		$query->order('d.ordering ASC');
 
-		// [2768] Reset the query using our newly populated query object.
+		// [2769] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2771] check if there was data returned
+		// [2772] check if there was data returned
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [2824] Convert the parameter fields into objects.
+			// [2825] Convert the parameter fields into objects.
 			foreach ($items as $nr => &$item)
 			{
-				// [2012] Make sure the content prepare plugins fire on description.
+				// [2008] Make sure the content prepare plugins fire on description.
 				$item->description = JHtml::_('content.prepare',$item->description);
-				// [2014] Checking if description has uikit components that must be loaded.
+				// [2010] Checking if description has uikit components that must be loaded.
 				$this->uikitComp = CostbenefitprojectionHelper::getUikitComp($item->description,$this->uikitComp);
-				// [2012] Make sure the content prepare plugins fire on reference.
+				// [2008] Make sure the content prepare plugins fire on reference.
 				$item->reference = JHtml::_('content.prepare',$item->reference);
-				// [2014] Checking if reference has uikit components that must be loaded.
+				// [2010] Checking if reference has uikit components that must be loaded.
 				$this->uikitComp = CostbenefitprojectionHelper::getUikitComp($item->reference,$this->uikitComp);
 			}
 			return $items;
@@ -418,19 +418,19 @@ class CostbenefitprojectionModelCompanyresults extends JModelItem
 	*/
 	public function getCausesrisksIdCauseriskEbbe_G($causesrisks)
 	{
-		// [2710] Get a db connection.
+		// [2711] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2712] Create a new query object.
+		// [2713] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2714] Get from #__costbenefitprojection_causerisk as g
+		// [2715] Get from #__costbenefitprojection_causerisk as g
 		$query->select($db->quoteName(
 			array('g.id','g.name','g.ref','g.alias','g.description'),
 			array('id','name','ref','alias','description')));
 		$query->from($db->quoteName('#__costbenefitprojection_causerisk', 'g'));
 
-		// [2720] Check if $causesrisks is an array with values.
+		// [2721] Check if $causesrisks is an array with values.
 		$array = $causesrisks;
 		if (isset($array) && CostbenefitprojectionHelper::checkArray($array))
 		{
@@ -441,21 +441,21 @@ class CostbenefitprojectionModelCompanyresults extends JModelItem
 			return false;
 		}
 
-		// [2768] Reset the query using our newly populated query object.
+		// [2769] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2771] check if there was data returned
+		// [2772] check if there was data returned
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [2824] Convert the parameter fields into objects.
+			// [2825] Convert the parameter fields into objects.
 			foreach ($items as $nr => &$item)
 			{
-				// [2012] Make sure the content prepare plugins fire on description.
+				// [2008] Make sure the content prepare plugins fire on description.
 				$item->description = JHtml::_('content.prepare',$item->description);
-				// [2014] Checking if description has uikit components that must be loaded.
+				// [2010] Checking if description has uikit components that must be loaded.
 				$this->uikitComp = CostbenefitprojectionHelper::getUikitComp($item->description,$this->uikitComp);
 			}
 			return $items;
@@ -471,19 +471,19 @@ class CostbenefitprojectionModelCompanyresults extends JModelItem
 	*/
 	public function getCountryCountryHealth_dataEbbe_BB($country)
 	{
-		// [2710] Get a db connection.
+		// [2711] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2712] Create a new query object.
+		// [2713] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2714] Get from #__costbenefitprojection_health_data as bb
+		// [2715] Get from #__costbenefitprojection_health_data as bb
 		$query->select($db->quoteName(
 			array('bb.id','bb.asset_id','bb.causerisk','bb.year','bb.country','bb.maledeath','bb.maleyld','bb.femaledeath','bb.femaleyld','bb.published','bb.created_by','bb.modified_by','bb.created','bb.modified','bb.version','bb.hits','bb.ordering'),
 			array('id','asset_id','causerisk','year','country','maledeath','maleyld','femaledeath','femaleyld','published','created_by','modified_by','created','modified','version','hits','ordering')));
 		$query->from($db->quoteName('#__costbenefitprojection_health_data', 'bb'));
 		$query->where('bb.country = ' . $db->quote($country));
-				// [2127] Check if $this->e_causesrisks is an array with values.
+				// [2123] Check if $this->e_causesrisks is an array with values.
 				$array = $this->e_causesrisks;
 				if (isset($array) && CostbenefitprojectionHelper::checkArray($array))
 				{
@@ -497,11 +497,11 @@ class CostbenefitprojectionModelCompanyresults extends JModelItem
 		$query->where('bb.year = ' . $db->quote($this->e_datayear));
 		$query->order('bb.ordering ASC');
 
-		// [2768] Reset the query using our newly populated query object.
+		// [2769] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2771] check if there was data returned
+		// [2772] check if there was data returned
 		if ($db->getNumRows())
 		{
 			return $db->loadObjectList();
@@ -517,19 +517,19 @@ class CostbenefitprojectionModelCompanyresults extends JModelItem
 	*/
 	public function getCausesrisksIdCauseriskEbbe_GG($causesrisks)
 	{
-		// [2710] Get a db connection.
+		// [2711] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2712] Create a new query object.
+		// [2713] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2714] Get from #__costbenefitprojection_causerisk as gg
+		// [2715] Get from #__costbenefitprojection_causerisk as gg
 		$query->select($db->quoteName(
 			array('gg.id','gg.name','gg.ref','gg.alias','gg.description'),
 			array('id','name','ref','alias','description')));
 		$query->from($db->quoteName('#__costbenefitprojection_causerisk', 'gg'));
 
-		// [2720] Check if $causesrisks is an array with values.
+		// [2721] Check if $causesrisks is an array with values.
 		$array = $causesrisks;
 		if (isset($array) && CostbenefitprojectionHelper::checkArray($array))
 		{
@@ -540,21 +540,21 @@ class CostbenefitprojectionModelCompanyresults extends JModelItem
 			return false;
 		}
 
-		// [2768] Reset the query using our newly populated query object.
+		// [2769] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2771] check if there was data returned
+		// [2772] check if there was data returned
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [2824] Convert the parameter fields into objects.
+			// [2825] Convert the parameter fields into objects.
 			foreach ($items as $nr => &$item)
 			{
-				// [2012] Make sure the content prepare plugins fire on description.
+				// [2008] Make sure the content prepare plugins fire on description.
 				$item->description = JHtml::_('content.prepare',$item->description);
-				// [2014] Checking if description has uikit components that must be loaded.
+				// [2010] Checking if description has uikit components that must be loaded.
 				$this->uikitComp = CostbenefitprojectionHelper::getUikitComp($item->description,$this->uikitComp);
 			}
 			return $items;
diff --git a/admin/models/costbenefitprojection.php b/admin/models/costbenefitprojection.php
index df38e13f..f8be9b34 100644
--- a/admin/models/costbenefitprojection.php
+++ b/admin/models/costbenefitprojection.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -39,7 +39,7 @@ class CostbenefitprojectionModelCostbenefitprojection extends JModelList
 		$viewGroups = array(
 			'main' => array('png.company.add', 'png.companies', 'png.service_provider.add', 'png.service_providers', 'png.countries', 'png.causerisk.add', 'png.causesrisks', 'png.health_data_sets', 'png.scaling_factor.add', 'png.scaling_factors', 'png.intervention.add', 'png.interventions', 'png.currencies', 'png.help_documents')
 		);
-		// [12190] view access array
+		// [12191] view access array
 		$viewAccess = array(
 			'company.create' => 'company.create',
 			'companies.access' => 'company.access',
diff --git a/admin/models/countries.php b/admin/models/countries.php
index 9cbd6708..aa93bdc0 100644
--- a/admin/models/countries.php
+++ b/admin/models/countries.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -111,16 +111,16 @@ class CostbenefitprojectionModelCountries extends JModelList
 	 */
 	public function getItems()
 	{ 
-		// [10544] check in items
+		// [10545] check in items
 		$this->checkInNow();
 
 		// load parent items
 		$items = parent::getItems();
 
-		// [10619] set values to display correctly.
+		// [10620] set values to display correctly.
 		if (CostbenefitprojectionHelper::checkArray($items))
 		{
-			// [10622] get user object.
+			// [10623] get user object.
 			$user = JFactory::getUser();
 			foreach ($items as $nr => &$item)
 			{
@@ -145,16 +145,16 @@ class CostbenefitprojectionModelCountries extends JModelList
 	 */
 	protected function getListQuery()
 	{
-		// [7405] Get the user object.
+		// [7406] Get the user object.
 		$user = JFactory::getUser();
-		// [7407] Create a new query object.
+		// [7408] Create a new query object.
 		$db = JFactory::getDBO();
 		$query = $db->getQuery(true);
 
-		// [7410] Select some fields
+		// [7411] Select some fields
 		$query->select('a.*');
 
-		// [7417] From the costbenefitprojection_item table
+		// [7418] From the costbenefitprojection_item table
 		$query->from($db->quoteName('#__costbenefitprojection_country', 'a'));
 
 		// Filter the countries (admin sees all)
@@ -173,15 +173,15 @@ class CostbenefitprojectionModelCountries extends JModelList
 			}
 		}
 
-		// [7558] From the users table.
+		// [7559] From the users table.
 		$query->select($db->quoteName('g.name','user_name'));
 		$query->join('LEFT', $db->quoteName('#__users', 'g') . ' ON (' . $db->quoteName('a.user') . ' = ' . $db->quoteName('g.id') . ')');
 
-		// [7558] From the costbenefitprojection_currency table.
+		// [7559] From the costbenefitprojection_currency table.
 		$query->select($db->quoteName('h.name','currency_name'));
 		$query->join('LEFT', $db->quoteName('#__costbenefitprojection_currency', 'h') . ' ON (' . $db->quoteName('a.currency') . ' = ' . $db->quoteName('h.codethree') . ')');
 
-		// [7431] Filter by published state
+		// [7432] Filter by published state
 		$published = $this->getState('filter.published');
 		if (is_numeric($published))
 		{
@@ -192,21 +192,21 @@ class CostbenefitprojectionModelCountries extends JModelList
 			$query->where('(a.published = 0 OR a.published = 1)');
 		}
 
-		// [7443] Join over the asset groups.
+		// [7444] Join over the asset groups.
 		$query->select('ag.title AS access_level');
 		$query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
-		// [7446] Filter by access level.
+		// [7447] Filter by access level.
 		if ($access = $this->getState('filter.access'))
 		{
 			$query->where('a.access = ' . (int) $access);
 		}
-		// [7451] Implement View Level Access
+		// [7452] Implement View Level Access
 		if (!$user->authorise('core.options', 'com_costbenefitprojection'))
 		{
 			$groups = implode(',', $user->getAuthorisedViewLevels());
 			$query->where('a.access IN (' . $groups . ')');
 		}
-		// [7528] Filter by search.
+		// [7529] Filter by search.
 		$search = $this->getState('filter.search');
 		if (!empty($search))
 		{
@@ -221,13 +221,13 @@ class CostbenefitprojectionModelCountries extends JModelList
 			}
 		}
 
-		// [7762] Filter by currency.
+		// [7763] Filter by currency.
 		if ($currency = $this->getState('filter.currency'))
 		{
 			$query->where('a.currency = ' . $db->quote($db->escape($currency, true)));
 		}
 
-		// [7487] Add the list ordering clause.
+		// [7488] Add the list ordering clause.
 		$orderCol = $this->state->get('list.ordering', 'a.id');
 		$orderDirn = $this->state->get('list.direction', 'asc');	
 		if ($orderCol != '')
@@ -245,19 +245,19 @@ class CostbenefitprojectionModelCountries extends JModelList
 	*/
 	public function getExportData($pks)
 	{
-		// [7195] setup the query
+		// [7196] setup the query
 		if (CostbenefitprojectionHelper::checkArray($pks))
 		{
-			// [7198] Get the user object.
+			// [7199] Get the user object.
 			$user = JFactory::getUser();
-			// [7200] Create a new query object.
+			// [7201] Create a new query object.
 			$db = JFactory::getDBO();
 			$query = $db->getQuery(true);
 
-			// [7203] Select some fields
+			// [7204] Select some fields
 			$query->select('a.*');
 
-			// [7205] From the costbenefitprojection_country table
+			// [7206] From the costbenefitprojection_country table
 			$query->from($db->quoteName('#__costbenefitprojection_country', 'a'));
 			$query->where('a.id IN (' . implode(',',$pks) . ')');
 
@@ -276,27 +276,27 @@ class CostbenefitprojectionModelCountries extends JModelList
 				$query->where('a.id = -4');
 			}
 		}
-			// [7215] Implement View Level Access
+			// [7216] Implement View Level Access
 			if (!$user->authorise('core.options', 'com_costbenefitprojection'))
 			{
 				$groups = implode(',', $user->getAuthorisedViewLevels());
 				$query->where('a.access IN (' . $groups . ')');
 			}
 
-			// [7222] Order the results by ordering
+			// [7223] Order the results by ordering
 			$query->order('a.ordering  ASC');
 
-			// [7224] Load the items
+			// [7225] Load the items
 			$db->setQuery($query);
 			$db->execute();
 			if ($db->getNumRows())
 			{
 				$items = $db->loadObjectList();
 
-				// [10619] set values to display correctly.
+				// [10620] set values to display correctly.
 				if (CostbenefitprojectionHelper::checkArray($items))
 				{
-					// [10622] get user object.
+					// [10623] get user object.
 					$user = JFactory::getUser();
 					foreach ($items as $nr => &$item)
 					{
@@ -307,13 +307,13 @@ class CostbenefitprojectionModelCountries extends JModelList
 							continue;
 						}
 
-						// [10832] unset the values we don't want exported.
+						// [10833] unset the values we don't want exported.
 						unset($item->asset_id);
 						unset($item->checked_out);
 						unset($item->checked_out_time);
 					}
 				}
-				// [10841] Add headers to items array.
+				// [10842] Add headers to items array.
 				$headers = $this->getExImPortHeaders();
 				if (CostbenefitprojectionHelper::checkObject($headers))
 				{
@@ -332,13 +332,13 @@ class CostbenefitprojectionModelCountries extends JModelList
 	*/
 	public function getExImPortHeaders()
 	{
-		// [7244] Get a db connection.
+		// [7245] Get a db connection.
 		$db = JFactory::getDbo();
-		// [7246] get the columns
+		// [7247] get the columns
 		$columns = $db->getTableColumns("#__costbenefitprojection_country");
 		if (CostbenefitprojectionHelper::checkArray($columns))
 		{
-			// [7250] remove the headers you don't import/export.
+			// [7251] remove the headers you don't import/export.
 			unset($columns['asset_id']);
 			unset($columns['checked_out']);
 			unset($columns['checked_out_time']);
@@ -360,7 +360,7 @@ class CostbenefitprojectionModelCountries extends JModelList
 	 */
 	protected function getStoreId($id = '')
 	{
-		// [10167] Compile the store id.
+		// [10168] Compile the store id.
 		$id .= ':' . $this->getState('filter.id');
 		$id .= ':' . $this->getState('filter.search');
 		$id .= ':' . $this->getState('filter.published');
@@ -385,15 +385,15 @@ class CostbenefitprojectionModelCountries extends JModelList
 	*/
 	protected function checkInNow()
 	{
-		// [10560] Get set check in time
+		// [10561] Get set check in time
 		$time = JComponentHelper::getParams('com_costbenefitprojection')->get('check_in');
 		
 		if ($time)
 		{
 
-			// [10565] Get a db connection.
+			// [10566] Get a db connection.
 			$db = JFactory::getDbo();
-			// [10567] reset query
+			// [10568] reset query
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__costbenefitprojection_country'));
@@ -401,24 +401,24 @@ class CostbenefitprojectionModelCountries extends JModelList
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// [10575] Get Yesterdays date
+				// [10576] Get Yesterdays date
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// [10577] reset query
+				// [10578] reset query
 				$query = $db->getQuery(true);
 
-				// [10579] Fields to update.
+				// [10580] Fields to update.
 				$fields = array(
 					$db->quoteName('checked_out_time') . '=\'0000-00-00 00:00:00\'',
 					$db->quoteName('checked_out') . '=0'
 				);
 
-				// [10584] Conditions for which records should be updated.
+				// [10585] Conditions for which records should be updated.
 				$conditions = array(
 					$db->quoteName('checked_out') . '!=0', 
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);
 
-				// [10589] Check table
+				// [10590] Check table
 				$query->update($db->quoteName('#__costbenefitprojection_country'))->set($fields)->where($conditions); 
 
 				$db->setQuery($query);
diff --git a/admin/models/country.php b/admin/models/country.php
index a3203cb3..59c22b9d 100644
--- a/admin/models/country.php
+++ b/admin/models/country.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -91,7 +91,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 
 			if (!empty($item->causesrisks))
 			{
-				// [4004] JSON Decode causesrisks.
+				// [4005] JSON Decode causesrisks.
 				$item->causesrisks = json_decode($item->causesrisks);
 			}
 			
@@ -101,8 +101,8 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 				$item->tags->getTagIds($item->id, 'com_costbenefitprojection.country');
 			}
 		}
-		$this->countryyslr = $item->id;
-		$this->countryjygc = $item->id;
+		$this->countrygtcm = $item->id;
+		$this->countryhkwg = $item->id;
 
 		return $item;
 	}
@@ -112,18 +112,18 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 	*
 	* @return mixed  An array of data items on success, false on failure.
 	*/
-	public function getHhiservice_providers()
+	public function getMqkservice_providers()
 	{
-		// [6953] Get the user object.
+		// [6954] Get the user object.
 		$user = JFactory::getUser();
-		// [6955] Create a new query object.
+		// [6956] Create a new query object.
 		$db = JFactory::getDBO();
 		$query = $db->getQuery(true);
 
-		// [6958] Select some fields
+		// [6959] Select some fields
 		$query->select('a.*');
 
-		// [6965] From the costbenefitprojection_service_provider table
+		// [6966] From the costbenefitprojection_service_provider table
 		$query->from($db->quoteName('#__costbenefitprojection_service_provider', 'a'));
 
 		// Filter the providers (admin sees all)
@@ -143,43 +143,43 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 			}
 		}
 
-		// [7558] From the users table.
+		// [7559] From the users table.
 		$query->select($db->quoteName('g.name','user_name'));
 		$query->join('LEFT', $db->quoteName('#__users', 'g') . ' ON (' . $db->quoteName('a.user') . ' = ' . $db->quoteName('g.id') . ')');
 
-		// [7558] From the costbenefitprojection_country table.
+		// [7559] From the costbenefitprojection_country table.
 		$query->select($db->quoteName('h.name','country_name'));
 		$query->join('LEFT', $db->quoteName('#__costbenefitprojection_country', 'h') . ' ON (' . $db->quoteName('a.country') . ' = ' . $db->quoteName('h.id') . ')');
 
-		// [6981] Filter by countryyslr global.
-		$countryyslr = $this->countryyslr;
-		if (is_numeric($countryyslr ))
+		// [6982] Filter by countrygtcm global.
+		$countrygtcm = $this->countrygtcm;
+		if (is_numeric($countrygtcm ))
 		{
-			$query->where('a.country = ' . (int) $countryyslr );
+			$query->where('a.country = ' . (int) $countrygtcm );
 		}
-		elseif (is_string($countryyslr))
+		elseif (is_string($countrygtcm))
 		{
-			$query->where('a.country = ' . $db->quote($countryyslr));
+			$query->where('a.country = ' . $db->quote($countrygtcm));
 		}
 		else
 		{
 			$query->where('a.country = -5');
 		}
 
-		// [7013] Order the results by ordering
+		// [7014] Order the results by ordering
 		$query->order('a.ordering  ASC');
 
-		// [7015] Load the items
+		// [7016] Load the items
 		$db->setQuery($query);
 		$db->execute();
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [10619] set values to display correctly.
+			// [10620] set values to display correctly.
 			if (CostbenefitprojectionHelper::checkArray($items))
 			{
-				// [10622] get user object.
+				// [10623] get user object.
 				$user = JFactory::getUser();
 				foreach ($items as $nr => &$item)
 				{
@@ -202,18 +202,18 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 	*
 	* @return mixed  An array of data items on success, false on failure.
 	*/
-	public function getYqdcompanies()
+	public function getLqmcompanies()
 	{
-		// [6953] Get the user object.
+		// [6954] Get the user object.
 		$user = JFactory::getUser();
-		// [6955] Create a new query object.
+		// [6956] Create a new query object.
 		$db = JFactory::getDBO();
 		$query = $db->getQuery(true);
 
-		// [6958] Select some fields
+		// [6959] Select some fields
 		$query->select('a.*');
 
-		// [6965] From the costbenefitprojection_company table
+		// [6966] From the costbenefitprojection_company table
 		$query->from($db->quoteName('#__costbenefitprojection_company', 'a'));
 
 		// Filter by companies (admin sees all)
@@ -233,62 +233,62 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 			}
 		}
 
-		// [7558] From the users table.
+		// [7559] From the users table.
 		$query->select($db->quoteName('g.name','user_name'));
 		$query->join('LEFT', $db->quoteName('#__users', 'g') . ' ON (' . $db->quoteName('a.user') . ' = ' . $db->quoteName('g.id') . ')');
 
-		// [7558] From the costbenefitprojection_country table.
+		// [7559] From the costbenefitprojection_country table.
 		$query->select($db->quoteName('h.name','country_name'));
 		$query->join('LEFT', $db->quoteName('#__costbenefitprojection_country', 'h') . ' ON (' . $db->quoteName('a.country') . ' = ' . $db->quoteName('h.id') . ')');
 
-		// [7558] From the costbenefitprojection_service_provider table.
+		// [7559] From the costbenefitprojection_service_provider table.
 		$query->select($db->quoteName('i.user','serviceprovider_user'));
 		$query->join('LEFT', $db->quoteName('#__costbenefitprojection_service_provider', 'i') . ' ON (' . $db->quoteName('a.serviceprovider') . ' = ' . $db->quoteName('i.id') . ')');
 
-		// [6981] Filter by countryjygc global.
-		$countryjygc = $this->countryjygc;
-		if (is_numeric($countryjygc ))
+		// [6982] Filter by countryhkwg global.
+		$countryhkwg = $this->countryhkwg;
+		if (is_numeric($countryhkwg ))
 		{
-			$query->where('a.country = ' . (int) $countryjygc );
+			$query->where('a.country = ' . (int) $countryhkwg );
 		}
-		elseif (is_string($countryjygc))
+		elseif (is_string($countryhkwg))
 		{
-			$query->where('a.country = ' . $db->quote($countryjygc));
+			$query->where('a.country = ' . $db->quote($countryhkwg));
 		}
 		else
 		{
 			$query->where('a.country = -5');
 		}
 
-		// [6998] Join over the asset groups.
+		// [6999] Join over the asset groups.
 		$query->select('ag.title AS access_level');
 		$query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
-		// [7001] Filter by access level.
+		// [7002] Filter by access level.
 		if ($access = $this->getState('filter.access'))
 		{
 			$query->where('a.access = ' . (int) $access);
 		}
-		// [7006] Implement View Level Access
+		// [7007] Implement View Level Access
 		if (!$user->authorise('core.options', 'com_costbenefitprojection'))
 		{
 			$groups = implode(',', $user->getAuthorisedViewLevels());
 			$query->where('a.access IN (' . $groups . ')');
 		}
 
-		// [7013] Order the results by ordering
+		// [7014] Order the results by ordering
 		$query->order('a.ordering  ASC');
 
-		// [7015] Load the items
+		// [7016] Load the items
 		$db->setQuery($query);
 		$db->execute();
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [10619] set values to display correctly.
+			// [10620] set values to display correctly.
 			if (CostbenefitprojectionHelper::checkArray($items))
 			{
-				// [10622] get user object.
+				// [10623] get user object.
 				$user = JFactory::getUser();
 				foreach ($items as $nr => &$item)
 				{
@@ -302,15 +302,15 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 				}
 			}
 
-			// [10885] set selection value to a translatable value
+			// [10886] set selection value to a translatable value
 			if (CostbenefitprojectionHelper::checkArray($items))
 			{
 				foreach ($items as $nr => &$item)
 				{
-					// [10892] convert department
-					$item->department = $this->selectionTranslationYqdcompanies($item->department, 'department');
-					// [10892] convert per
-					$item->per = $this->selectionTranslationYqdcompanies($item->per, 'per');
+					// [10893] convert department
+					$item->department = $this->selectionTranslationLqmcompanies($item->department, 'department');
+					// [10893] convert per
+					$item->per = $this->selectionTranslationLqmcompanies($item->per, 'per');
 				}
 			}
 
@@ -324,29 +324,29 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 	*
 	* @return translatable string
 	*/
-	public function selectionTranslationYqdcompanies($value,$name)
+	public function selectionTranslationLqmcompanies($value,$name)
 	{
-		// [10918] Array of department language strings
+		// [10919] Array of department language strings
 		if ($name == 'department')
 		{
 			$departmentArray = array(
 				1 => 'COM_COSTBENEFITPROJECTION_COMPANY_BASIC',
 				2 => 'COM_COSTBENEFITPROJECTION_COMPANY_ADVANCED'
 			);
-			// [10949] Now check if value is found in this array
+			// [10950] Now check if value is found in this array
 			if (isset($departmentArray[$value]) && CostbenefitprojectionHelper::checkString($departmentArray[$value]))
 			{
 				return $departmentArray[$value];
 			}
 		}
-		// [10918] Array of per language strings
+		// [10919] Array of per language strings
 		if ($name == 'per')
 		{
 			$perArray = array(
 				1 => 'COM_COSTBENEFITPROJECTION_COMPANY_OPEN',
 				0 => 'COM_COSTBENEFITPROJECTION_COMPANY_LOCKED'
 			);
-			// [10949] Now check if value is found in this array
+			// [10950] Now check if value is found in this array
 			if (isset($perArray[$value]) && CostbenefitprojectionHelper::checkString($perArray[$value]))
 			{
 				return $perArray[$value];
@@ -366,7 +366,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 	 * @since   1.6
 	 */
 	public function getForm($data = array(), $loadData = true)
-	{		// [9574] Get the form.
+	{		// [9575] Get the form.
 		$form = $this->loadForm('com_costbenefitprojection.country', 'country', array('control' => 'jform', 'load_data' => $loadData));
 
 		if (empty($form))
@@ -376,12 +376,12 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 
 		$jinput = JFactory::getApplication()->input;
 
-		// [9659] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first.
+		// [9660] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first.
 		if ($jinput->get('a_id'))
 		{
 			$id = $jinput->get('a_id', 0, 'INT');
 		}
-		// [9664] The back end uses id so we use that the rest of the time and set it to 0 by default.
+		// [9665] The back end uses id so we use that the rest of the time and set it to 0 by default.
 		else
 		{
 			$id = $jinput->get('id', 0, 'INT');
@@ -389,34 +389,34 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 
 		$user = JFactory::getUser();
 
-		// [9670] Check for existing item.
-		// [9671] Modify the form based on Edit State access controls.
+		// [9671] Check for existing item.
+		// [9672] Modify the form based on Edit State access controls.
 		if ($id != 0 && (!$user->authorise('country.edit.state', 'com_costbenefitprojection.country.' . (int) $id))
 			|| ($id == 0 && !$user->authorise('country.edit.state', 'com_costbenefitprojection')))
 		{
-			// [9684] Disable fields for display.
+			// [9685] Disable fields for display.
 			$form->setFieldAttribute('ordering', 'disabled', 'true');
 			$form->setFieldAttribute('published', 'disabled', 'true');
-			// [9687] Disable fields while saving.
+			// [9688] Disable fields while saving.
 			$form->setFieldAttribute('ordering', 'filter', 'unset');
 			$form->setFieldAttribute('published', 'filter', 'unset');
 		}
-		// [9692] Modify the form based on Edit Creaded By access controls.
+		// [9693] Modify the form based on Edit Creaded By access controls.
 		if (!$user->authorise('core.edit.created_by', 'com_costbenefitprojection'))
 		{
-			// [9704] Disable fields for display.
+			// [9705] Disable fields for display.
 			$form->setFieldAttribute('created_by', 'disabled', 'true');
-			// [9706] Disable fields for display.
+			// [9707] Disable fields for display.
 			$form->setFieldAttribute('created_by', 'readonly', 'true');
-			// [9708] Disable fields while saving.
+			// [9709] Disable fields while saving.
 			$form->setFieldAttribute('created_by', 'filter', 'unset');
 		}
-		// [9711] Modify the form based on Edit Creaded Date access controls.
+		// [9712] Modify the form based on Edit Creaded Date access controls.
 		if (!$user->authorise('core.edit.created', 'com_costbenefitprojection'))
 		{
-			// [9723] Disable fields for display.
+			// [9724] Disable fields for display.
 			$form->setFieldAttribute('created', 'disabled', 'true');
-			// [9725] Disable fields while saving.
+			// [9726] Disable fields while saving.
 			$form->setFieldAttribute('created', 'filter', 'unset');
 		}
 
@@ -452,7 +452,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 			}
 
 			$user = JFactory::getUser();
-			// [9875] The record has been set. Check the record permissions.
+			// [9876] The record has been set. Check the record permissions.
 			return $user->authorise('country.delete', 'com_costbenefitprojection.country.' . (int) $record->id);
 		}
 		return false;
@@ -474,14 +474,14 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 
 		if ($recordId)
 		{
-			// [9962] The record has been set. Check the record permissions.
+			// [9963] The record has been set. Check the record permissions.
 			$permission = $user->authorise('country.edit.state', 'com_costbenefitprojection.country.' . (int) $recordId);
 			if (!$permission && !is_null($permission))
 			{
 				return false;
 			}
 		}
-		// [9979] In the absense of better information, revert to the component permissions.
+		// [9980] In the absense of better information, revert to the component permissions.
 		return $user->authorise('country.edit.state', 'com_costbenefitprojection');
 	}
     
@@ -496,7 +496,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 	 */
 	protected function allowEdit($data = array(), $key = 'id')
 	{
-		// [9787] Check specific edit permission then general edit permission.
+		// [9788] Check specific edit permission then general edit permission.
 		$user = JFactory::getUser();
 		$recordId	= (int) isset($data[$key]) ? $data[$key] : 0;
 		if (!$user->authorise('core.options', 'com_costbenefitprojection'))
@@ -713,7 +713,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 	{
 		if (empty($this->batchSet))
 		{
-			// [4940] Set some needed variables.
+			// [4941] Set some needed variables.
 			$this->user 		= JFactory::getUser();
 			$this->table 		= $this->getTable();
 			$this->tableClassName	= get_class($this->table);
@@ -758,12 +758,12 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 		}
 
 
-		// [4960] get list of uniqe fields
+		// [4961] get list of uniqe fields
 		$uniqeFields = $this->getUniqeFields();
-		// [4962] remove move_copy from array
+		// [4963] remove move_copy from array
 		unset($values['move_copy']);
 
-		// [4965] make sure published is set
+		// [4966] make sure published is set
 		if (!isset($values['published']))
 		{
 			$values['published'] = 0;
@@ -775,21 +775,21 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 
 		$newIds = array();
 
-		// [5002] Parent exists so let's proceed
+		// [5003] Parent exists so let's proceed
 		while (!empty($pks))
 		{
-			// [5005] Pop the first ID off the stack
+			// [5006] Pop the first ID off the stack
 			$pk = array_shift($pks);
 
 			$this->table->reset();
 
-			// [5010] only allow copy if user may edit this item.
+			// [5011] only allow copy if user may edit this item.
 
 			if (!$this->user->authorise('country.edit', $contexts[$pk]))
 
 			{
 
-				// [5020] Not fatal error
+				// [5021] Not fatal error
 
 				$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 
@@ -797,19 +797,19 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 
 			}
 
-			// [5025] Check that the row actually exists
+			// [5026] Check that the row actually exists
 			if (!$this->table->load($pk))
 			{
 				if ($error = $this->table->getError())
 				{
-					// [5030] Fatal error
+					// [5031] Fatal error
 					$this->setError($error);
 
 					return false;
 				}
 				else
 				{
-					// [5037] Not fatal error
+					// [5038] Not fatal error
 					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 					continue;
 				}
@@ -817,7 +817,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 
 			list($this->table->name, $this->table->alias) = $this->_generateNewTitle($this->table->alias, $this->table->name);
 
-			// [5073] insert all set values
+			// [5074] insert all set values
 			if (CostbenefitprojectionHelper::checkArray($values))
 			{
 				foreach ($values as $key => $value)
@@ -829,7 +829,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 				}
 			}
 
-			// [5085] update all uniqe fields
+			// [5086] update all uniqe fields
 			if (CostbenefitprojectionHelper::checkArray($uniqeFields))
 			{
 				foreach ($uniqeFields as $uniqeField)
@@ -838,13 +838,13 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 				}
 			}
 
-			// [5094] Reset the ID because we are making a copy
+			// [5095] Reset the ID because we are making a copy
 			$this->table->id = 0;
 
-			// [5097] TODO: Deal with ordering?
-			// [5098] $this->table->ordering	= 1;
+			// [5098] TODO: Deal with ordering?
+			// [5099] $this->table->ordering	= 1;
 
-			// [5100] Check the row.
+			// [5101] Check the row.
 			if (!$this->table->check())
 			{
 				$this->setError($this->table->getError());
@@ -857,7 +857,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 				$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
 			}
 
-			// [5113] Store the row.
+			// [5114] Store the row.
 			if (!$this->table->store())
 			{
 				$this->setError($this->table->getError());
@@ -865,14 +865,14 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 				return false;
 			}
 
-			// [5121] Get the new item ID
+			// [5122] Get the new item ID
 			$newId = $this->table->get('id');
 
-			// [5124] Add the new ID to the array
+			// [5125] Add the new ID to the array
 			$newIds[$pk] = $newId;
 		}
 
-		// [5128] Clean the cache
+		// [5129] Clean the cache
 		$this->cleanCache();
 
 		return $newIds;
@@ -893,7 +893,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 	{
 		if (empty($this->batchSet))
 		{
-			// [4742] Set some needed variables.
+			// [4743] Set some needed variables.
 			$this->user		= JFactory::getUser();
 			$this->table		= $this->getTable();
 			$this->tableClassName	= get_class($this->table);
@@ -939,15 +939,15 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 		}
 
 
-		// [4764] make sure published only updates if user has the permission.
+		// [4765] make sure published only updates if user has the permission.
 		if (isset($values['published']) && !$this->canDo->get('country.edit.state'))
 		{
 			unset($values['published']);
 		}
-		// [4777] remove move_copy from array
+		// [4778] remove move_copy from array
 		unset($values['move_copy']);
 
-		// [4798] Parent exists so we proceed
+		// [4799] Parent exists so we proceed
 		foreach ($pks as $pk)
 		{
 			if (!$this->user->authorise('country.edit', $contexts[$pk]))
@@ -957,30 +957,30 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 				return false;
 			}
 
-			// [4815] Check that the row actually exists
+			// [4816] Check that the row actually exists
 			if (!$this->table->load($pk))
 			{
 				if ($error = $this->table->getError())
 				{
-					// [4820] Fatal error
+					// [4821] Fatal error
 					$this->setError($error);
 
 					return false;
 				}
 				else
 				{
-					// [4827] Not fatal error
+					// [4828] Not fatal error
 					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 					continue;
 				}
 			}
 
-			// [4833] insert all set values.
+			// [4834] insert all set values.
 			if (CostbenefitprojectionHelper::checkArray($values))
 			{
 				foreach ($values as $key => $value)
 				{
-					// [4838] Do special action for access.
+					// [4839] Do special action for access.
 					if ('access' == $key && strlen($value) > 0)
 					{
 						$this->table->$key = $value;
@@ -993,7 +993,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 			}
 
 
-			// [4850] Check the row.
+			// [4851] Check the row.
 			if (!$this->table->check())
 			{
 				$this->setError($this->table->getError());
@@ -1006,7 +1006,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 				$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
 			}
 
-			// [4863] Store the row.
+			// [4864] Store the row.
 			if (!$this->table->store())
 			{
 				$this->setError($this->table->getError());
@@ -1015,7 +1015,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 			}
 		}
 
-		// [4872] Clean the cache
+		// [4873] Clean the cache
 		$this->cleanCache();
 
 		return true;
@@ -1045,7 +1045,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 			$data['metadata'] = (string) $metadata;
 		} 
 
-		// [4114] Set the causesrisks string to JSON string.
+		// [4115] Set the causesrisks string to JSON string.
 		if (isset($data['causesrisks']))
 		{
 			$data['causesrisks'] = (string) json_encode($data['causesrisks']);
@@ -1059,7 +1059,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 			$data['params'] = (string) $params;
 		}
 
-		// [5154] Alter the name for save as copy
+		// [5155] Alter the name for save as copy
 		if ($input->get('task') == 'save2copy')
 		{
 			$origTable = clone $this->getTable();
@@ -1082,7 +1082,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 			$data['published'] = 0;
 		}
 
-		// [5181] Automatic handling of alias for empty fields
+		// [5182] Automatic handling of alias for empty fields
 		if (in_array($input->get('task'), array('apply', 'save', 'save2new')) && (int) $input->get('id') == 0)
 		{
 			if ($data['alias'] == null)
@@ -1113,10 +1113,10 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 			}
 		}
 
-		// [5220] Alter the uniqe field for save as copy
+		// [5221] Alter the uniqe field for save as copy
 		if ($input->get('task') == 'save2copy')
 		{
-			// [5223] Automatic handling of other uniqe fields
+			// [5224] Automatic handling of other uniqe fields
 			$uniqeFields = $this->getUniqeFields();
 			if (CostbenefitprojectionHelper::checkArray($uniqeFields))
 			{
@@ -1170,7 +1170,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 	protected function _generateNewTitle($alias, $title)
 	{
 
-		// [5254] Alter the title & alias
+		// [5255] Alter the title & alias
 		$table = $this->getTable();
 
 		while ($table->load(array('alias' => $alias)))
diff --git a/admin/models/currencies.php b/admin/models/currencies.php
index ea2af53e..7aff56e5 100644
--- a/admin/models/currencies.php
+++ b/admin/models/currencies.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -103,16 +103,16 @@ class CostbenefitprojectionModelCurrencies extends JModelList
 	 */
 	public function getItems()
 	{ 
-		// [10544] check in items
+		// [10545] check in items
 		$this->checkInNow();
 
 		// load parent items
 		$items = parent::getItems();
 
-		// [10619] set values to display correctly.
+		// [10620] set values to display correctly.
 		if (CostbenefitprojectionHelper::checkArray($items))
 		{
-			// [10622] get user object.
+			// [10623] get user object.
 			$user = JFactory::getUser();
 			foreach ($items as $nr => &$item)
 			{
@@ -137,19 +137,19 @@ class CostbenefitprojectionModelCurrencies extends JModelList
 	 */
 	protected function getListQuery()
 	{
-		// [7405] Get the user object.
+		// [7406] Get the user object.
 		$user = JFactory::getUser();
-		// [7407] Create a new query object.
+		// [7408] Create a new query object.
 		$db = JFactory::getDBO();
 		$query = $db->getQuery(true);
 
-		// [7410] Select some fields
+		// [7411] Select some fields
 		$query->select('a.*');
 
-		// [7417] From the costbenefitprojection_item table
+		// [7418] From the costbenefitprojection_item table
 		$query->from($db->quoteName('#__costbenefitprojection_currency', 'a'));
 
-		// [7431] Filter by published state
+		// [7432] Filter by published state
 		$published = $this->getState('filter.published');
 		if (is_numeric($published))
 		{
@@ -160,21 +160,21 @@ class CostbenefitprojectionModelCurrencies extends JModelList
 			$query->where('(a.published = 0 OR a.published = 1)');
 		}
 
-		// [7443] Join over the asset groups.
+		// [7444] Join over the asset groups.
 		$query->select('ag.title AS access_level');
 		$query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
-		// [7446] Filter by access level.
+		// [7447] Filter by access level.
 		if ($access = $this->getState('filter.access'))
 		{
 			$query->where('a.access = ' . (int) $access);
 		}
-		// [7451] Implement View Level Access
+		// [7452] Implement View Level Access
 		if (!$user->authorise('core.options', 'com_costbenefitprojection'))
 		{
 			$groups = implode(',', $user->getAuthorisedViewLevels());
 			$query->where('a.access IN (' . $groups . ')');
 		}
-		// [7528] Filter by search.
+		// [7529] Filter by search.
 		$search = $this->getState('filter.search');
 		if (!empty($search))
 		{
@@ -190,7 +190,7 @@ class CostbenefitprojectionModelCurrencies extends JModelList
 		}
 
 
-		// [7487] Add the list ordering clause.
+		// [7488] Add the list ordering clause.
 		$orderCol = $this->state->get('list.ordering', 'a.id');
 		$orderDirn = $this->state->get('list.direction', 'asc');	
 		if ($orderCol != '')
@@ -208,42 +208,42 @@ class CostbenefitprojectionModelCurrencies extends JModelList
 	*/
 	public function getExportData($pks)
 	{
-		// [7195] setup the query
+		// [7196] setup the query
 		if (CostbenefitprojectionHelper::checkArray($pks))
 		{
-			// [7198] Get the user object.
+			// [7199] Get the user object.
 			$user = JFactory::getUser();
-			// [7200] Create a new query object.
+			// [7201] Create a new query object.
 			$db = JFactory::getDBO();
 			$query = $db->getQuery(true);
 
-			// [7203] Select some fields
+			// [7204] Select some fields
 			$query->select('a.*');
 
-			// [7205] From the costbenefitprojection_currency table
+			// [7206] From the costbenefitprojection_currency table
 			$query->from($db->quoteName('#__costbenefitprojection_currency', 'a'));
 			$query->where('a.id IN (' . implode(',',$pks) . ')');
-			// [7215] Implement View Level Access
+			// [7216] Implement View Level Access
 			if (!$user->authorise('core.options', 'com_costbenefitprojection'))
 			{
 				$groups = implode(',', $user->getAuthorisedViewLevels());
 				$query->where('a.access IN (' . $groups . ')');
 			}
 
-			// [7222] Order the results by ordering
+			// [7223] Order the results by ordering
 			$query->order('a.ordering  ASC');
 
-			// [7224] Load the items
+			// [7225] Load the items
 			$db->setQuery($query);
 			$db->execute();
 			if ($db->getNumRows())
 			{
 				$items = $db->loadObjectList();
 
-				// [10619] set values to display correctly.
+				// [10620] set values to display correctly.
 				if (CostbenefitprojectionHelper::checkArray($items))
 				{
-					// [10622] get user object.
+					// [10623] get user object.
 					$user = JFactory::getUser();
 					foreach ($items as $nr => &$item)
 					{
@@ -254,13 +254,13 @@ class CostbenefitprojectionModelCurrencies extends JModelList
 							continue;
 						}
 
-						// [10832] unset the values we don't want exported.
+						// [10833] unset the values we don't want exported.
 						unset($item->asset_id);
 						unset($item->checked_out);
 						unset($item->checked_out_time);
 					}
 				}
-				// [10841] Add headers to items array.
+				// [10842] Add headers to items array.
 				$headers = $this->getExImPortHeaders();
 				if (CostbenefitprojectionHelper::checkObject($headers))
 				{
@@ -279,13 +279,13 @@ class CostbenefitprojectionModelCurrencies extends JModelList
 	*/
 	public function getExImPortHeaders()
 	{
-		// [7244] Get a db connection.
+		// [7245] Get a db connection.
 		$db = JFactory::getDbo();
-		// [7246] get the columns
+		// [7247] get the columns
 		$columns = $db->getTableColumns("#__costbenefitprojection_currency");
 		if (CostbenefitprojectionHelper::checkArray($columns))
 		{
-			// [7250] remove the headers you don't import/export.
+			// [7251] remove the headers you don't import/export.
 			unset($columns['asset_id']);
 			unset($columns['checked_out']);
 			unset($columns['checked_out_time']);
@@ -307,7 +307,7 @@ class CostbenefitprojectionModelCurrencies extends JModelList
 	 */
 	protected function getStoreId($id = '')
 	{
-		// [10167] Compile the store id.
+		// [10168] Compile the store id.
 		$id .= ':' . $this->getState('filter.id');
 		$id .= ':' . $this->getState('filter.search');
 		$id .= ':' . $this->getState('filter.published');
@@ -330,15 +330,15 @@ class CostbenefitprojectionModelCurrencies extends JModelList
 	*/
 	protected function checkInNow()
 	{
-		// [10560] Get set check in time
+		// [10561] Get set check in time
 		$time = JComponentHelper::getParams('com_costbenefitprojection')->get('check_in');
 		
 		if ($time)
 		{
 
-			// [10565] Get a db connection.
+			// [10566] Get a db connection.
 			$db = JFactory::getDbo();
-			// [10567] reset query
+			// [10568] reset query
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__costbenefitprojection_currency'));
@@ -346,24 +346,24 @@ class CostbenefitprojectionModelCurrencies extends JModelList
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// [10575] Get Yesterdays date
+				// [10576] Get Yesterdays date
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// [10577] reset query
+				// [10578] reset query
 				$query = $db->getQuery(true);
 
-				// [10579] Fields to update.
+				// [10580] Fields to update.
 				$fields = array(
 					$db->quoteName('checked_out_time') . '=\'0000-00-00 00:00:00\'',
 					$db->quoteName('checked_out') . '=0'
 				);
 
-				// [10584] Conditions for which records should be updated.
+				// [10585] Conditions for which records should be updated.
 				$conditions = array(
 					$db->quoteName('checked_out') . '!=0', 
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);
 
-				// [10589] Check table
+				// [10590] Check table
 				$query->update($db->quoteName('#__costbenefitprojection_currency'))->set($fields)->where($conditions); 
 
 				$db->setQuery($query);
diff --git a/admin/models/currency.php b/admin/models/currency.php
index 836c53a4..e018cf54 100644
--- a/admin/models/currency.php
+++ b/admin/models/currency.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -110,7 +110,7 @@ class CostbenefitprojectionModelCurrency extends JModelAdmin
 	 * @since   1.6
 	 */
 	public function getForm($data = array(), $loadData = true)
-	{		// [9574] Get the form.
+	{		// [9575] Get the form.
 		$form = $this->loadForm('com_costbenefitprojection.currency', 'currency', array('control' => 'jform', 'load_data' => $loadData));
 
 		if (empty($form))
@@ -120,12 +120,12 @@ class CostbenefitprojectionModelCurrency extends JModelAdmin
 
 		$jinput = JFactory::getApplication()->input;
 
-		// [9659] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first.
+		// [9660] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first.
 		if ($jinput->get('a_id'))
 		{
 			$id = $jinput->get('a_id', 0, 'INT');
 		}
-		// [9664] The back end uses id so we use that the rest of the time and set it to 0 by default.
+		// [9665] The back end uses id so we use that the rest of the time and set it to 0 by default.
 		else
 		{
 			$id = $jinput->get('id', 0, 'INT');
@@ -133,34 +133,34 @@ class CostbenefitprojectionModelCurrency extends JModelAdmin
 
 		$user = JFactory::getUser();
 
-		// [9670] Check for existing item.
-		// [9671] Modify the form based on Edit State access controls.
+		// [9671] Check for existing item.
+		// [9672] Modify the form based on Edit State access controls.
 		if ($id != 0 && (!$user->authorise('currency.edit.state', 'com_costbenefitprojection.currency.' . (int) $id))
 			|| ($id == 0 && !$user->authorise('currency.edit.state', 'com_costbenefitprojection')))
 		{
-			// [9684] Disable fields for display.
+			// [9685] Disable fields for display.
 			$form->setFieldAttribute('ordering', 'disabled', 'true');
 			$form->setFieldAttribute('published', 'disabled', 'true');
-			// [9687] Disable fields while saving.
+			// [9688] Disable fields while saving.
 			$form->setFieldAttribute('ordering', 'filter', 'unset');
 			$form->setFieldAttribute('published', 'filter', 'unset');
 		}
-		// [9692] Modify the form based on Edit Creaded By access controls.
+		// [9693] Modify the form based on Edit Creaded By access controls.
 		if (!$user->authorise('core.edit.created_by', 'com_costbenefitprojection'))
 		{
-			// [9704] Disable fields for display.
+			// [9705] Disable fields for display.
 			$form->setFieldAttribute('created_by', 'disabled', 'true');
-			// [9706] Disable fields for display.
+			// [9707] Disable fields for display.
 			$form->setFieldAttribute('created_by', 'readonly', 'true');
-			// [9708] Disable fields while saving.
+			// [9709] Disable fields while saving.
 			$form->setFieldAttribute('created_by', 'filter', 'unset');
 		}
-		// [9711] Modify the form based on Edit Creaded Date access controls.
+		// [9712] Modify the form based on Edit Creaded Date access controls.
 		if (!$user->authorise('core.edit.created', 'com_costbenefitprojection'))
 		{
-			// [9723] Disable fields for display.
+			// [9724] Disable fields for display.
 			$form->setFieldAttribute('created', 'disabled', 'true');
-			// [9725] Disable fields while saving.
+			// [9726] Disable fields while saving.
 			$form->setFieldAttribute('created', 'filter', 'unset');
 		}
 
@@ -196,7 +196,7 @@ class CostbenefitprojectionModelCurrency extends JModelAdmin
 			}
 
 			$user = JFactory::getUser();
-			// [9875] The record has been set. Check the record permissions.
+			// [9876] The record has been set. Check the record permissions.
 			return $user->authorise('currency.delete', 'com_costbenefitprojection.currency.' . (int) $record->id);
 		}
 		return false;
@@ -218,14 +218,14 @@ class CostbenefitprojectionModelCurrency extends JModelAdmin
 
 		if ($recordId)
 		{
-			// [9962] The record has been set. Check the record permissions.
+			// [9963] The record has been set. Check the record permissions.
 			$permission = $user->authorise('currency.edit.state', 'com_costbenefitprojection.currency.' . (int) $recordId);
 			if (!$permission && !is_null($permission))
 			{
 				return false;
 			}
 		}
-		// [9979] In the absense of better information, revert to the component permissions.
+		// [9980] In the absense of better information, revert to the component permissions.
 		return $user->authorise('currency.edit.state', 'com_costbenefitprojection');
 	}
     
@@ -240,7 +240,7 @@ class CostbenefitprojectionModelCurrency extends JModelAdmin
 	 */
 	protected function allowEdit($data = array(), $key = 'id')
 	{
-		// [9787] Check specific edit permission then general edit permission.
+		// [9788] Check specific edit permission then general edit permission.
 		$user = JFactory::getUser();
 
 		return $user->authorise('currency.edit', 'com_costbenefitprojection.currency.'. ((int) isset($data[$key]) ? $data[$key] : 0)) or $user->authorise('currency.edit',  'com_costbenefitprojection');
@@ -447,7 +447,7 @@ class CostbenefitprojectionModelCurrency extends JModelAdmin
 	{
 		if (empty($this->batchSet))
 		{
-			// [4940] Set some needed variables.
+			// [4941] Set some needed variables.
 			$this->user 		= JFactory::getUser();
 			$this->table 		= $this->getTable();
 			$this->tableClassName	= get_class($this->table);
@@ -461,12 +461,12 @@ class CostbenefitprojectionModelCurrency extends JModelAdmin
 			return false;
 		}
 
-		// [4960] get list of uniqe fields
+		// [4961] get list of uniqe fields
 		$uniqeFields = $this->getUniqeFields();
-		// [4962] remove move_copy from array
+		// [4963] remove move_copy from array
 		unset($values['move_copy']);
 
-		// [4965] make sure published is set
+		// [4966] make sure published is set
 		if (!isset($values['published']))
 		{
 			$values['published'] = 0;
@@ -478,21 +478,21 @@ class CostbenefitprojectionModelCurrency extends JModelAdmin
 
 		$newIds = array();
 
-		// [5002] Parent exists so let's proceed
+		// [5003] Parent exists so let's proceed
 		while (!empty($pks))
 		{
-			// [5005] Pop the first ID off the stack
+			// [5006] Pop the first ID off the stack
 			$pk = array_shift($pks);
 
 			$this->table->reset();
 
-			// [5010] only allow copy if user may edit this item.
+			// [5011] only allow copy if user may edit this item.
 
 			if (!$this->user->authorise('currency.edit', $contexts[$pk]))
 
 			{
 
-				// [5020] Not fatal error
+				// [5021] Not fatal error
 
 				$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 
@@ -500,19 +500,19 @@ class CostbenefitprojectionModelCurrency extends JModelAdmin
 
 			}
 
-			// [5025] Check that the row actually exists
+			// [5026] Check that the row actually exists
 			if (!$this->table->load($pk))
 			{
 				if ($error = $this->table->getError())
 				{
-					// [5030] Fatal error
+					// [5031] Fatal error
 					$this->setError($error);
 
 					return false;
 				}
 				else
 				{
-					// [5037] Not fatal error
+					// [5038] Not fatal error
 					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 					continue;
 				}
@@ -520,7 +520,7 @@ class CostbenefitprojectionModelCurrency extends JModelAdmin
 
 			list($this->table->name, $this->table->alias) = $this->_generateNewTitle($this->table->alias, $this->table->name);
 
-			// [5073] insert all set values
+			// [5074] insert all set values
 			if (CostbenefitprojectionHelper::checkArray($values))
 			{
 				foreach ($values as $key => $value)
@@ -532,7 +532,7 @@ class CostbenefitprojectionModelCurrency extends JModelAdmin
 				}
 			}
 
-			// [5085] update all uniqe fields
+			// [5086] update all uniqe fields
 			if (CostbenefitprojectionHelper::checkArray($uniqeFields))
 			{
 				foreach ($uniqeFields as $uniqeField)
@@ -541,13 +541,13 @@ class CostbenefitprojectionModelCurrency extends JModelAdmin
 				}
 			}
 
-			// [5094] Reset the ID because we are making a copy
+			// [5095] Reset the ID because we are making a copy
 			$this->table->id = 0;
 
-			// [5097] TODO: Deal with ordering?
-			// [5098] $this->table->ordering	= 1;
+			// [5098] TODO: Deal with ordering?
+			// [5099] $this->table->ordering	= 1;
 
-			// [5100] Check the row.
+			// [5101] Check the row.
 			if (!$this->table->check())
 			{
 				$this->setError($this->table->getError());
@@ -560,7 +560,7 @@ class CostbenefitprojectionModelCurrency extends JModelAdmin
 				$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
 			}
 
-			// [5113] Store the row.
+			// [5114] Store the row.
 			if (!$this->table->store())
 			{
 				$this->setError($this->table->getError());
@@ -568,14 +568,14 @@ class CostbenefitprojectionModelCurrency extends JModelAdmin
 				return false;
 			}
 
-			// [5121] Get the new item ID
+			// [5122] Get the new item ID
 			$newId = $this->table->get('id');
 
-			// [5124] Add the new ID to the array
+			// [5125] Add the new ID to the array
 			$newIds[$pk] = $newId;
 		}
 
-		// [5128] Clean the cache
+		// [5129] Clean the cache
 		$this->cleanCache();
 
 		return $newIds;
@@ -596,7 +596,7 @@ class CostbenefitprojectionModelCurrency extends JModelAdmin
 	{
 		if (empty($this->batchSet))
 		{
-			// [4742] Set some needed variables.
+			// [4743] Set some needed variables.
 			$this->user		= JFactory::getUser();
 			$this->table		= $this->getTable();
 			$this->tableClassName	= get_class($this->table);
@@ -611,15 +611,15 @@ class CostbenefitprojectionModelCurrency extends JModelAdmin
 			return false;
 		}
 
-		// [4764] make sure published only updates if user has the permission.
+		// [4765] make sure published only updates if user has the permission.
 		if (isset($values['published']) && !$this->canDo->get('currency.edit.state'))
 		{
 			unset($values['published']);
 		}
-		// [4777] remove move_copy from array
+		// [4778] remove move_copy from array
 		unset($values['move_copy']);
 
-		// [4798] Parent exists so we proceed
+		// [4799] Parent exists so we proceed
 		foreach ($pks as $pk)
 		{
 			if (!$this->user->authorise('currency.edit', $contexts[$pk]))
@@ -629,30 +629,30 @@ class CostbenefitprojectionModelCurrency extends JModelAdmin
 				return false;
 			}
 
-			// [4815] Check that the row actually exists
+			// [4816] Check that the row actually exists
 			if (!$this->table->load($pk))
 			{
 				if ($error = $this->table->getError())
 				{
-					// [4820] Fatal error
+					// [4821] Fatal error
 					$this->setError($error);
 
 					return false;
 				}
 				else
 				{
-					// [4827] Not fatal error
+					// [4828] Not fatal error
 					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 					continue;
 				}
 			}
 
-			// [4833] insert all set values.
+			// [4834] insert all set values.
 			if (CostbenefitprojectionHelper::checkArray($values))
 			{
 				foreach ($values as $key => $value)
 				{
-					// [4838] Do special action for access.
+					// [4839] Do special action for access.
 					if ('access' == $key && strlen($value) > 0)
 					{
 						$this->table->$key = $value;
@@ -665,7 +665,7 @@ class CostbenefitprojectionModelCurrency extends JModelAdmin
 			}
 
 
-			// [4850] Check the row.
+			// [4851] Check the row.
 			if (!$this->table->check())
 			{
 				$this->setError($this->table->getError());
@@ -678,7 +678,7 @@ class CostbenefitprojectionModelCurrency extends JModelAdmin
 				$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
 			}
 
-			// [4863] Store the row.
+			// [4864] Store the row.
 			if (!$this->table->store())
 			{
 				$this->setError($this->table->getError());
@@ -687,7 +687,7 @@ class CostbenefitprojectionModelCurrency extends JModelAdmin
 			}
 		}
 
-		// [4872] Clean the cache
+		// [4873] Clean the cache
 		$this->cleanCache();
 
 		return true;
@@ -725,7 +725,7 @@ class CostbenefitprojectionModelCurrency extends JModelAdmin
 			$data['params'] = (string) $params;
 		}
 
-		// [5154] Alter the name for save as copy
+		// [5155] Alter the name for save as copy
 		if ($input->get('task') == 'save2copy')
 		{
 			$origTable = clone $this->getTable();
@@ -748,7 +748,7 @@ class CostbenefitprojectionModelCurrency extends JModelAdmin
 			$data['published'] = 0;
 		}
 
-		// [5181] Automatic handling of alias for empty fields
+		// [5182] Automatic handling of alias for empty fields
 		if (in_array($input->get('task'), array('apply', 'save', 'save2new')) && (int) $input->get('id') == 0)
 		{
 			if ($data['alias'] == null)
@@ -779,10 +779,10 @@ class CostbenefitprojectionModelCurrency extends JModelAdmin
 			}
 		}
 
-		// [5220] Alter the uniqe field for save as copy
+		// [5221] Alter the uniqe field for save as copy
 		if ($input->get('task') == 'save2copy')
 		{
-			// [5223] Automatic handling of other uniqe fields
+			// [5224] Automatic handling of other uniqe fields
 			$uniqeFields = $this->getUniqeFields();
 			if (CostbenefitprojectionHelper::checkArray($uniqeFields))
 			{
@@ -836,7 +836,7 @@ class CostbenefitprojectionModelCurrency extends JModelAdmin
 	protected function _generateNewTitle($alias, $title)
 	{
 
-		// [5254] Alter the title & alias
+		// [5255] Alter the title & alias
 		$table = $this->getTable();
 
 		while ($table->load(array('alias' => $alias)))
diff --git a/admin/models/fields/articles.php b/admin/models/fields/articles.php
index 0c003abf..c3ccab26 100644
--- a/admin/models/fields/articles.php
+++ b/admin/models/fields/articles.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -44,36 +44,36 @@ class JFormFieldArticles extends JFormFieldList
 	 */
 	protected function getInput()
 	{
-		// [7699] see if we should add buttons
+		// [7700] see if we should add buttons
 		$setButton = $this->getAttribute('button');
-		// [7701] get html
+		// [7702] get html
 		$html = parent::getInput();
-		// [7703] if true set button
+		// [7704] if true set button
 		if ($setButton === 'true')
 		{
 			$user = JFactory::getUser();
-			// [7707] only add if user allowed to create article
+			// [7708] only add if user allowed to create article
 			if ($user->authorise('core.create', 'com_costbenefitprojection'))
 			{
-				// [7725] get the input from url
+				// [7726] get the input from url
 				$jinput = JFactory::getApplication()->input;
-				// [7727] get the view name & id
+				// [7728] get the view name & id
 				$values = $jinput->getArray(array(
 					'id' => 'int',
 					'view' => 'word'
 				));
-				// [7732] check if new item
+				// [7733] check if new item
 				$ref = '';
 				if (!is_null($values['id']) && strlen($values['view']))
 				{
-					// [7736] only load referal if not new item.
+					// [7737] only load referal if not new item.
 					$ref = '&amp;ref=' . $values['view'] . '&amp;refid=' . $values['id'];
 				}
-				// [7739] build the button
+				// [7740] build the button
 				$button = '<a class="btn btn-small btn-success"
 					href="index.php?option=com_costbenefitprojection&amp;view=article&amp;layout=edit'.$ref.'" >
 					<span class="icon-new icon-white"></span>' . JText::_('COM_COSTBENEFITPROJECTION_NEW') . '</a>';
-				// [7743] return the button attached to input field
+				// [7744] return the button attached to input field
 				return $html . $button;
 			}
 		}
diff --git a/admin/models/fields/causesrisks.php b/admin/models/fields/causesrisks.php
index 8e65ffc7..71ba07f6 100644
--- a/admin/models/fields/causesrisks.php
+++ b/admin/models/fields/causesrisks.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -44,36 +44,36 @@ class JFormFieldCausesrisks extends JFormFieldList
 	 */
 	protected function getInput()
 	{
-		// [7699] see if we should add buttons
+		// [7700] see if we should add buttons
 		$setButton = $this->getAttribute('button');
-		// [7701] get html
+		// [7702] get html
 		$html = parent::getInput();
-		// [7703] if true set button
+		// [7704] if true set button
 		if ($setButton === 'true')
 		{
 			$user = JFactory::getUser();
-			// [7707] only add if user allowed to create causerisk
+			// [7708] only add if user allowed to create causerisk
 			if ($user->authorise('causerisk.create', 'com_costbenefitprojection'))
 			{
-				// [7725] get the input from url
+				// [7726] get the input from url
 				$jinput = JFactory::getApplication()->input;
-				// [7727] get the view name & id
+				// [7728] get the view name & id
 				$values = $jinput->getArray(array(
 					'id' => 'int',
 					'view' => 'word'
 				));
-				// [7732] check if new item
+				// [7733] check if new item
 				$ref = '';
 				if (!is_null($values['id']) && strlen($values['view']))
 				{
-					// [7736] only load referal if not new item.
+					// [7737] only load referal if not new item.
 					$ref = '&amp;ref=' . $values['view'] . '&amp;refid=' . $values['id'];
 				}
-				// [7739] build the button
+				// [7740] build the button
 				$button = '<a class="btn btn-small btn-success"
 					href="index.php?option=com_costbenefitprojection&amp;view=causerisk&amp;layout=edit'.$ref.'" >
 					<span class="icon-new icon-white"></span>' . JText::_('COM_COSTBENEFITPROJECTION_NEW') . '</a>';
-				// [7743] return the button attached to input field
+				// [7744] return the button attached to input field
 				return $html . $button;
 			}
 		}
diff --git a/admin/models/fields/causesriskscheck.php b/admin/models/fields/causesriskscheck.php
index 4cca9b48..77104a0d 100644
--- a/admin/models/fields/causesriskscheck.php
+++ b/admin/models/fields/causesriskscheck.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/models/fields/company.php b/admin/models/fields/company.php
index d44684d1..eebeb280 100644
--- a/admin/models/fields/company.php
+++ b/admin/models/fields/company.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -44,36 +44,36 @@ class JFormFieldCompany extends JFormFieldList
 	 */
 	protected function getInput()
 	{
-		// [7699] see if we should add buttons
+		// [7700] see if we should add buttons
 		$setButton = $this->getAttribute('button');
-		// [7701] get html
+		// [7702] get html
 		$html = parent::getInput();
-		// [7703] if true set button
+		// [7704] if true set button
 		if ($setButton === 'true')
 		{
 			$user = JFactory::getUser();
-			// [7707] only add if user allowed to create company
+			// [7708] only add if user allowed to create company
 			if ($user->authorise('company.create', 'com_costbenefitprojection'))
 			{
-				// [7725] get the input from url
+				// [7726] get the input from url
 				$jinput = JFactory::getApplication()->input;
-				// [7727] get the view name & id
+				// [7728] get the view name & id
 				$values = $jinput->getArray(array(
 					'id' => 'int',
 					'view' => 'word'
 				));
-				// [7732] check if new item
+				// [7733] check if new item
 				$ref = '';
 				if (!is_null($values['id']) && strlen($values['view']))
 				{
-					// [7736] only load referal if not new item.
+					// [7737] only load referal if not new item.
 					$ref = '&amp;ref=' . $values['view'] . '&amp;refid=' . $values['id'];
 				}
-				// [7739] build the button
+				// [7740] build the button
 				$button = '<a class="btn btn-small btn-success"
 					href="index.php?option=com_costbenefitprojection&amp;view=company&amp;layout=edit'.$ref.'" >
 					<span class="icon-new icon-white"></span>' . JText::_('COM_COSTBENEFITPROJECTION_NEW') . '</a>';
-				// [7743] return the button attached to input field
+				// [7744] return the button attached to input field
 				return $html . $button;
 			}
 		}
diff --git a/admin/models/fields/countries.php b/admin/models/fields/countries.php
index c986e2a9..231976f2 100644
--- a/admin/models/fields/countries.php
+++ b/admin/models/fields/countries.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -44,36 +44,36 @@ class JFormFieldCountries extends JFormFieldList
 	 */
 	protected function getInput()
 	{
-		// [7699] see if we should add buttons
+		// [7700] see if we should add buttons
 		$setButton = $this->getAttribute('button');
-		// [7701] get html
+		// [7702] get html
 		$html = parent::getInput();
-		// [7703] if true set button
+		// [7704] if true set button
 		if ($setButton === 'true')
 		{
 			$user = JFactory::getUser();
-			// [7707] only add if user allowed to create country
+			// [7708] only add if user allowed to create country
 			if ($user->authorise('country.create', 'com_costbenefitprojection'))
 			{
-				// [7725] get the input from url
+				// [7726] get the input from url
 				$jinput = JFactory::getApplication()->input;
-				// [7727] get the view name & id
+				// [7728] get the view name & id
 				$values = $jinput->getArray(array(
 					'id' => 'int',
 					'view' => 'word'
 				));
-				// [7732] check if new item
+				// [7733] check if new item
 				$ref = '';
 				if (!is_null($values['id']) && strlen($values['view']))
 				{
-					// [7736] only load referal if not new item.
+					// [7737] only load referal if not new item.
 					$ref = '&amp;ref=' . $values['view'] . '&amp;refid=' . $values['id'];
 				}
-				// [7739] build the button
+				// [7740] build the button
 				$button = '<a class="btn btn-small btn-success"
 					href="index.php?option=com_costbenefitprojection&amp;view=country&amp;layout=edit'.$ref.'" >
 					<span class="icon-new icon-white"></span>' . JText::_('COM_COSTBENEFITPROJECTION_NEW') . '</a>';
-				// [7743] return the button attached to input field
+				// [7744] return the button attached to input field
 				return $html . $button;
 			}
 		}
diff --git a/admin/models/fields/countryuser.php b/admin/models/fields/countryuser.php
index 42680b08..42788da0 100644
--- a/admin/models/fields/countryuser.php
+++ b/admin/models/fields/countryuser.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/models/fields/currency.php b/admin/models/fields/currency.php
index 32a8b7bb..254e3ea3 100644
--- a/admin/models/fields/currency.php
+++ b/admin/models/fields/currency.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -44,36 +44,36 @@ class JFormFieldCurrency extends JFormFieldList
 	 */
 	protected function getInput()
 	{
-		// [7699] see if we should add buttons
+		// [7700] see if we should add buttons
 		$setButton = $this->getAttribute('button');
-		// [7701] get html
+		// [7702] get html
 		$html = parent::getInput();
-		// [7703] if true set button
+		// [7704] if true set button
 		if ($setButton === 'true')
 		{
 			$user = JFactory::getUser();
-			// [7707] only add if user allowed to create currency
+			// [7708] only add if user allowed to create currency
 			if ($user->authorise('currency.create', 'com_costbenefitprojection'))
 			{
-				// [7725] get the input from url
+				// [7726] get the input from url
 				$jinput = JFactory::getApplication()->input;
-				// [7727] get the view name & id
+				// [7728] get the view name & id
 				$values = $jinput->getArray(array(
 					'id' => 'int',
 					'view' => 'word'
 				));
-				// [7732] check if new item
+				// [7733] check if new item
 				$ref = '';
 				if (!is_null($values['id']) && strlen($values['view']))
 				{
-					// [7736] only load referal if not new item.
+					// [7737] only load referal if not new item.
 					$ref = '&amp;ref=' . $values['view'] . '&amp;refid=' . $values['id'];
 				}
-				// [7739] build the button
+				// [7740] build the button
 				$button = '<a class="btn btn-small btn-success"
 					href="index.php?option=com_costbenefitprojection&amp;view=currency&amp;layout=edit'.$ref.'" >
 					<span class="icon-new icon-white"></span>' . JText::_('COM_COSTBENEFITPROJECTION_NEW') . '</a>';
-				// [7743] return the button attached to input field
+				// [7744] return the button attached to input field
 				return $html . $button;
 			}
 		}
diff --git a/admin/models/fields/datayear.php b/admin/models/fields/datayear.php
index a65d5c35..1513256b 100644
--- a/admin/models/fields/datayear.php
+++ b/admin/models/fields/datayear.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -44,36 +44,36 @@ class JFormFieldDatayear extends JFormFieldList
 	 */
 	protected function getInput()
 	{
-		// [7699] see if we should add buttons
+		// [7700] see if we should add buttons
 		$setButton = $this->getAttribute('button');
-		// [7701] get html
+		// [7702] get html
 		$html = parent::getInput();
-		// [7703] if true set button
+		// [7704] if true set button
 		if ($setButton === 'true')
 		{
 			$user = JFactory::getUser();
-			// [7707] only add if user allowed to create health_data
+			// [7708] only add if user allowed to create health_data
 			if ($user->authorise('health_data.create', 'com_costbenefitprojection'))
 			{
-				// [7725] get the input from url
+				// [7726] get the input from url
 				$jinput = JFactory::getApplication()->input;
-				// [7727] get the view name & id
+				// [7728] get the view name & id
 				$values = $jinput->getArray(array(
 					'id' => 'int',
 					'view' => 'word'
 				));
-				// [7732] check if new item
+				// [7733] check if new item
 				$ref = '';
 				if (!is_null($values['id']) && strlen($values['view']))
 				{
-					// [7736] only load referal if not new item.
+					// [7737] only load referal if not new item.
 					$ref = '&amp;ref=' . $values['view'] . '&amp;refid=' . $values['id'];
 				}
-				// [7739] build the button
+				// [7740] build the button
 				$button = '<a class="btn btn-small btn-success"
 					href="index.php?option=com_costbenefitprojection&amp;view=health_data&amp;layout=edit'.$ref.'" >
 					<span class="icon-new icon-white"></span>' . JText::_('COM_COSTBENEFITPROJECTION_NEW') . '</a>';
-				// [7743] return the button attached to input field
+				// [7744] return the button attached to input field
 				return $html . $button;
 			}
 		}
diff --git a/admin/models/fields/interventions.php b/admin/models/fields/interventions.php
index f4c23ed9..d0ffb1c7 100644
--- a/admin/models/fields/interventions.php
+++ b/admin/models/fields/interventions.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -44,36 +44,36 @@ class JFormFieldInterventions extends JFormFieldList
 	 */
 	protected function getInput()
 	{
-		// [7699] see if we should add buttons
+		// [7700] see if we should add buttons
 		$setButton = $this->getAttribute('button');
-		// [7701] get html
+		// [7702] get html
 		$html = parent::getInput();
-		// [7703] if true set button
+		// [7704] if true set button
 		if ($setButton === 'true')
 		{
 			$user = JFactory::getUser();
-			// [7707] only add if user allowed to create intervention
+			// [7708] only add if user allowed to create intervention
 			if ($user->authorise('intervention.create', 'com_costbenefitprojection'))
 			{
-				// [7725] get the input from url
+				// [7726] get the input from url
 				$jinput = JFactory::getApplication()->input;
-				// [7727] get the view name & id
+				// [7728] get the view name & id
 				$values = $jinput->getArray(array(
 					'id' => 'int',
 					'view' => 'word'
 				));
-				// [7732] check if new item
+				// [7733] check if new item
 				$ref = '';
 				if (!is_null($values['id']) && strlen($values['view']))
 				{
-					// [7736] only load referal if not new item.
+					// [7737] only load referal if not new item.
 					$ref = '&amp;ref=' . $values['view'] . '&amp;refid=' . $values['id'];
 				}
-				// [7739] build the button
+				// [7740] build the button
 				$button = '<a class="btn btn-small btn-success"
 					href="index.php?option=com_costbenefitprojection&amp;view=intervention&amp;layout=edit'.$ref.'" >
 					<span class="icon-new icon-white"></span>' . JText::_('COM_COSTBENEFITPROJECTION_NEW') . '</a>';
-				// [7743] return the button attached to input field
+				// [7744] return the button attached to input field
 				return $html . $button;
 			}
 		}
diff --git a/admin/models/fields/memberuser.php b/admin/models/fields/memberuser.php
index 606cc19d..a40ef958 100644
--- a/admin/models/fields/memberuser.php
+++ b/admin/models/fields/memberuser.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/models/fields/serviceprovider.php b/admin/models/fields/serviceprovider.php
index c3c77d48..a434844b 100644
--- a/admin/models/fields/serviceprovider.php
+++ b/admin/models/fields/serviceprovider.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -44,36 +44,36 @@ class JFormFieldServiceprovider extends JFormFieldList
 	 */
 	protected function getInput()
 	{
-		// [7699] see if we should add buttons
+		// [7700] see if we should add buttons
 		$setButton = $this->getAttribute('button');
-		// [7701] get html
+		// [7702] get html
 		$html = parent::getInput();
-		// [7703] if true set button
+		// [7704] if true set button
 		if ($setButton === 'true')
 		{
 			$user = JFactory::getUser();
-			// [7707] only add if user allowed to create service_provider
+			// [7708] only add if user allowed to create service_provider
 			if ($user->authorise('service_provider.create', 'com_costbenefitprojection'))
 			{
-				// [7725] get the input from url
+				// [7726] get the input from url
 				$jinput = JFactory::getApplication()->input;
-				// [7727] get the view name & id
+				// [7728] get the view name & id
 				$values = $jinput->getArray(array(
 					'id' => 'int',
 					'view' => 'word'
 				));
-				// [7732] check if new item
+				// [7733] check if new item
 				$ref = '';
 				if (!is_null($values['id']) && strlen($values['view']))
 				{
-					// [7736] only load referal if not new item.
+					// [7737] only load referal if not new item.
 					$ref = '&amp;ref=' . $values['view'] . '&amp;refid=' . $values['id'];
 				}
-				// [7739] build the button
+				// [7740] build the button
 				$button = '<a class="btn btn-small btn-success"
 					href="index.php?option=com_costbenefitprojection&amp;view=service_provider&amp;layout=edit'.$ref.'" >
 					<span class="icon-new icon-white"></span>' . JText::_('COM_COSTBENEFITPROJECTION_NEW') . '</a>';
-				// [7743] return the button attached to input field
+				// [7744] return the button attached to input field
 				return $html . $button;
 			}
 		}
diff --git a/admin/models/fields/serviceprovideruser.php b/admin/models/fields/serviceprovideruser.php
index dafcfaa5..59f023e2 100644
--- a/admin/models/fields/serviceprovideruser.php
+++ b/admin/models/fields/serviceprovideruser.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/models/forms/causerisk.js b/admin/models/forms/causerisk.js
index 57568004..06d071da 100644
--- a/admin/models/forms/causerisk.js
+++ b/admin/models/forms/causerisk.js
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/models/forms/causerisk.xml b/admin/models/forms/causerisk.xml
index 26466fb8..87a6ce8c 100644
--- a/admin/models/forms/causerisk.xml
+++ b/admin/models/forms/causerisk.xml
@@ -4,15 +4,15 @@
 	addfieldpath="/administrator/components/com_costbenefitprojection/models/fields"
 >
 	<fieldset name="details">
-		<!-- [11027] Default Fields. -->
-		<!-- [11028] Id Field. Type: Text (joomla) -->
+		<!-- [11028] Default Fields. -->
+		<!-- [11029] Id Field. Type: Text (joomla) -->
 		<field
 			name="id"
 			type="text" class="readonly" label="JGLOBAL_FIELD_ID_LABEL"
 			description ="JGLOBAL_FIELD_ID_DESC" size="10" default="0"
 			readonly="true"
 		/>
-		<!-- [11035] Date Created Field. Type: Calendar (joomla) -->
+		<!-- [11036] Date Created Field. Type: Calendar (joomla) -->
 		<field
 			name="created"
 			type="calendar"
@@ -22,14 +22,14 @@
 			format="%Y-%m-%d %H:%M:%S"
 			filter="user_utc"
 		/>
-		<!-- [11046] User Created Field. Type: User (joomla) -->
+		<!-- [11047] User Created Field. Type: User (joomla) -->
 		<field
 			name="created_by"
 			type="user"
 			label="COM_COSTBENEFITPROJECTION_CAUSERISK_CREATED_BY_LABEL"
 			description="COM_COSTBENEFITPROJECTION_CAUSERISK_CREATED_BY_DESC"
 		/>
-		<!-- [11054] Published Field. Type: List (joomla) -->
+		<!-- [11055] Published Field. Type: List (joomla) -->
 		<field name="published" type="list" label="JSTATUS"
 			description="JFIELD_PUBLISHED_DESC" class="chzn-color-state"
 			filter="intval" size="1" default="1" >
@@ -42,18 +42,18 @@
 			<option value="-2">
 				JTRASHED</option>
 		</field>
-		<!-- [11069] Date Modified Field. Type: Calendar (joomla) -->
+		<!-- [11070] Date Modified Field. Type: Calendar (joomla) -->
 		<field name="modified" type="calendar" class="readonly"
 			label="JGLOBAL_FIELD_MODIFIED_LABEL" description="COM_CONTENT_FIELD_MODIFIED_DESC"
 			size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
-		<!-- [11073] User Modified Field. Type: User (joomla) -->
+		<!-- [11074] User Modified Field. Type: User (joomla) -->
 		<field name="modified_by" type="user"
 			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
 			class="readonly"
 			readonly="true"
 			filter="unset"
 		/>
-		<!-- [11083] Access Field. Type: Accesslevel (joomla) -->
+		<!-- [11084] Access Field. Type: Accesslevel (joomla) -->
 		<field name="access"
 			type="accesslevel"
 			label="JFIELD_ACCESS_LABEL"
@@ -61,7 +61,7 @@
 			default="1"
 			required="false"
 		/>
-		<!-- [11093] Ordering Field. Type: Numbers (joomla) -->
+		<!-- [11094] Ordering Field. Type: Numbers (joomla) -->
 		<field
 			name="ordering"
 			type="number"
@@ -72,7 +72,7 @@
 			size="6"
 			required="false"
 		/>
-		<!-- [11105] Version Field. Type: Text (joomla) -->
+		<!-- [11106] Version Field. Type: Text (joomla) -->
 		<field
 			name="version"
 			type="text"
@@ -83,8 +83,8 @@
 			readonly="true"
 			filter="unset"
 		/>
-		<!-- [11138] Dynamic Fields. -->
-		<!-- [11374] Name Field. Type: Text. (joomla) -->
+		<!-- [11139] Dynamic Fields. -->
+		<!-- [11375] Name Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="name"
@@ -100,7 +100,7 @@
 			message="Error! Please add name here."
 			hint="COM_COSTBENEFITPROJECTION_CAUSERISK_NAME_HINT"
 		/>
-		<!-- [11374] Ref Field. Type: Text. (joomla) -->
+		<!-- [11375] Ref Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="ref"
@@ -116,7 +116,7 @@
 			message="Error! Please add the reference number here."
 			hint="COM_COSTBENEFITPROJECTION_CAUSERISK_REF_HINT"
 		/>
-		<!-- [11374] Importname Field. Type: Text. (joomla) -->
+		<!-- [11375] Importname Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="importname"
@@ -132,7 +132,7 @@
 			message="Error! Please add import name here."
 			hint="COM_COSTBENEFITPROJECTION_CAUSERISK_IMPORTNAME_HINT"
 		/>
-		<!-- [11374] Description Field. Type: Textarea. (joomla) -->
+		<!-- [11375] Description Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
 			name="description"
@@ -144,7 +144,7 @@
 			filter="HTML"
 			hint="COM_COSTBENEFITPROJECTION_CAUSERISK_DESCRIPTION_HINT"
 		/>
-		<!-- [11374] Alias Field. Type: Text. (joomla) -->
+		<!-- [11375] Alias Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="alias"
@@ -155,15 +155,15 @@
 		/>
 	</fieldset>
 	
-	<!-- [10061] Access Control Fields. -->
+	<!-- [10062] Access Control Fields. -->
 	<fieldset name="accesscontrol">
-		<!-- [10063] Asset Id Field. Type: Hidden (joomla) -->
+		<!-- [10064] Asset Id Field. Type: Hidden (joomla) -->
 		<field
 			name="asset_id"
 			type="hidden"
 			filter="unset"
 		/>
-		<!-- [10069] Rules Field. Type: Rules (joomla) -->
+		<!-- [10070] Rules Field. Type: Rules (joomla) -->
 		<field
 			name="rules"
 			type="rules"
diff --git a/admin/models/forms/company.js b/admin/models/forms/company.js
index 7253e917..91e553cd 100644
--- a/admin/models/forms/company.js
+++ b/admin/models/forms/company.js
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -17,178 +17,178 @@
 /------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_MyenDgDunb_required = false;
-jform_MyenDgDhEP_required = false;
-jform_MyenDgDOtm_required = false;
-jform_MyenDgDxnU_required = false;
-jform_MyenDgDQwQ_required = false;
-jform_MyenDgDHoX_required = false;
-jform_MyenDgDOTm_required = false;
+jform_pydRZWraSY_required = false;
+jform_pydRZWrZBd_required = false;
+jform_pydRZWrJNR_required = false;
+jform_pydRZWrWAx_required = false;
+jform_pydRZWrrWa_required = false;
+jform_pydRZWrVtn_required = false;
+jform_pydRZWrqmt_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var department_MyenDgD = jQuery("#jform_department input[type='radio']:checked").val();
-	MyenDgD(department_MyenDgD);
+	var department_pydRZWr = jQuery("#jform_department input[type='radio']:checked").val();
+	pydRZWr(department_pydRZWr);
 
-	var department_JKkommy = jQuery("#jform_department input[type='radio']:checked").val();
-	JKkommy(department_JKkommy);
+	var department_sAKFZSC = jQuery("#jform_department input[type='radio']:checked").val();
+	sAKFZSC(department_sAKFZSC);
 });
 
-// the MyenDgD function
-function MyenDgD(department_MyenDgD)
+// the pydRZWr function
+function pydRZWr(department_pydRZWr)
 {
-	// [8016] set the function logic
-	if (department_MyenDgD == 2)
+	// [8017] set the function logic
+	if (department_pydRZWr == 2)
 	{
 		jQuery('#jform_causesrisks').closest('.control-group').show();
-		if (jform_MyenDgDunb_required)
+		if (jform_pydRZWraSY_required)
 		{
 			updateFieldRequired('causesrisks',0);
 			jQuery('#jform_causesrisks').prop('required','required');
 			jQuery('#jform_causesrisks').attr('aria-required',true);
 			jQuery('#jform_causesrisks').addClass('required');
-			jform_MyenDgDunb_required = false;
+			jform_pydRZWraSY_required = false;
 		}
 
 		jQuery('#jform_percentfemale').closest('.control-group').show();
 		jQuery('#jform_percentmale').closest('.control-group').show();
 		jQuery('#jform_productivity_losses').closest('.control-group').show();
-		if (jform_MyenDgDhEP_required)
+		if (jform_pydRZWrZBd_required)
 		{
 			updateFieldRequired('productivity_losses',0);
 			jQuery('#jform_productivity_losses').prop('required','required');
 			jQuery('#jform_productivity_losses').attr('aria-required',true);
 			jQuery('#jform_productivity_losses').addClass('required');
-			jform_MyenDgDhEP_required = false;
+			jform_pydRZWrZBd_required = false;
 		}
 
 		jQuery('#jform_medical_turnovers_females').closest('.control-group').show();
-		if (jform_MyenDgDOtm_required)
+		if (jform_pydRZWrJNR_required)
 		{
 			updateFieldRequired('medical_turnovers_females',0);
 			jQuery('#jform_medical_turnovers_females').prop('required','required');
 			jQuery('#jform_medical_turnovers_females').attr('aria-required',true);
 			jQuery('#jform_medical_turnovers_females').addClass('required');
-			jform_MyenDgDOtm_required = false;
+			jform_pydRZWrJNR_required = false;
 		}
 
 		jQuery('#jform_medical_turnovers_males').closest('.control-group').show();
-		if (jform_MyenDgDxnU_required)
+		if (jform_pydRZWrWAx_required)
 		{
 			updateFieldRequired('medical_turnovers_males',0);
 			jQuery('#jform_medical_turnovers_males').prop('required','required');
 			jQuery('#jform_medical_turnovers_males').attr('aria-required',true);
 			jQuery('#jform_medical_turnovers_males').addClass('required');
-			jform_MyenDgDxnU_required = false;
+			jform_pydRZWrWAx_required = false;
 		}
 
 		jQuery('#jform_sick_leave_females').closest('.control-group').show();
-		if (jform_MyenDgDQwQ_required)
+		if (jform_pydRZWrrWa_required)
 		{
 			updateFieldRequired('sick_leave_females',0);
 			jQuery('#jform_sick_leave_females').prop('required','required');
 			jQuery('#jform_sick_leave_females').attr('aria-required',true);
 			jQuery('#jform_sick_leave_females').addClass('required');
-			jform_MyenDgDQwQ_required = false;
+			jform_pydRZWrrWa_required = false;
 		}
 
 		jQuery('#jform_sick_leave_males').closest('.control-group').show();
-		if (jform_MyenDgDHoX_required)
+		if (jform_pydRZWrVtn_required)
 		{
 			updateFieldRequired('sick_leave_males',0);
 			jQuery('#jform_sick_leave_males').prop('required','required');
 			jQuery('#jform_sick_leave_males').attr('aria-required',true);
 			jQuery('#jform_sick_leave_males').addClass('required');
-			jform_MyenDgDHoX_required = false;
+			jform_pydRZWrVtn_required = false;
 		}
 
 		jQuery('#jform_total_healthcare').closest('.control-group').show();
-		if (jform_MyenDgDOTm_required)
+		if (jform_pydRZWrqmt_required)
 		{
 			updateFieldRequired('total_healthcare',0);
 			jQuery('#jform_total_healthcare').prop('required','required');
 			jQuery('#jform_total_healthcare').attr('aria-required',true);
 			jQuery('#jform_total_healthcare').addClass('required');
-			jform_MyenDgDOTm_required = false;
+			jform_pydRZWrqmt_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_causesrisks').closest('.control-group').hide();
-		if (!jform_MyenDgDunb_required)
+		if (!jform_pydRZWraSY_required)
 		{
 			updateFieldRequired('causesrisks',1);
 			jQuery('#jform_causesrisks').removeAttr('required');
 			jQuery('#jform_causesrisks').removeAttr('aria-required');
 			jQuery('#jform_causesrisks').removeClass('required');
-			jform_MyenDgDunb_required = true;
+			jform_pydRZWraSY_required = true;
 		}
 		jQuery('#jform_percentfemale').closest('.control-group').hide();
 		jQuery('#jform_percentmale').closest('.control-group').hide();
 		jQuery('#jform_productivity_losses').closest('.control-group').hide();
-		if (!jform_MyenDgDhEP_required)
+		if (!jform_pydRZWrZBd_required)
 		{
 			updateFieldRequired('productivity_losses',1);
 			jQuery('#jform_productivity_losses').removeAttr('required');
 			jQuery('#jform_productivity_losses').removeAttr('aria-required');
 			jQuery('#jform_productivity_losses').removeClass('required');
-			jform_MyenDgDhEP_required = true;
+			jform_pydRZWrZBd_required = true;
 		}
 		jQuery('#jform_medical_turnovers_females').closest('.control-group').hide();
-		if (!jform_MyenDgDOtm_required)
+		if (!jform_pydRZWrJNR_required)
 		{
 			updateFieldRequired('medical_turnovers_females',1);
 			jQuery('#jform_medical_turnovers_females').removeAttr('required');
 			jQuery('#jform_medical_turnovers_females').removeAttr('aria-required');
 			jQuery('#jform_medical_turnovers_females').removeClass('required');
-			jform_MyenDgDOtm_required = true;
+			jform_pydRZWrJNR_required = true;
 		}
 		jQuery('#jform_medical_turnovers_males').closest('.control-group').hide();
-		if (!jform_MyenDgDxnU_required)
+		if (!jform_pydRZWrWAx_required)
 		{
 			updateFieldRequired('medical_turnovers_males',1);
 			jQuery('#jform_medical_turnovers_males').removeAttr('required');
 			jQuery('#jform_medical_turnovers_males').removeAttr('aria-required');
 			jQuery('#jform_medical_turnovers_males').removeClass('required');
-			jform_MyenDgDxnU_required = true;
+			jform_pydRZWrWAx_required = true;
 		}
 		jQuery('#jform_sick_leave_females').closest('.control-group').hide();
-		if (!jform_MyenDgDQwQ_required)
+		if (!jform_pydRZWrrWa_required)
 		{
 			updateFieldRequired('sick_leave_females',1);
 			jQuery('#jform_sick_leave_females').removeAttr('required');
 			jQuery('#jform_sick_leave_females').removeAttr('aria-required');
 			jQuery('#jform_sick_leave_females').removeClass('required');
-			jform_MyenDgDQwQ_required = true;
+			jform_pydRZWrrWa_required = true;
 		}
 		jQuery('#jform_sick_leave_males').closest('.control-group').hide();
-		if (!jform_MyenDgDHoX_required)
+		if (!jform_pydRZWrVtn_required)
 		{
 			updateFieldRequired('sick_leave_males',1);
 			jQuery('#jform_sick_leave_males').removeAttr('required');
 			jQuery('#jform_sick_leave_males').removeAttr('aria-required');
 			jQuery('#jform_sick_leave_males').removeClass('required');
-			jform_MyenDgDHoX_required = true;
+			jform_pydRZWrVtn_required = true;
 		}
 		jQuery('#jform_total_healthcare').closest('.control-group').hide();
-		if (!jform_MyenDgDOTm_required)
+		if (!jform_pydRZWrqmt_required)
 		{
 			updateFieldRequired('total_healthcare',1);
 			jQuery('#jform_total_healthcare').removeAttr('required');
 			jQuery('#jform_total_healthcare').removeAttr('aria-required');
 			jQuery('#jform_total_healthcare').removeClass('required');
-			jform_MyenDgDOTm_required = true;
+			jform_pydRZWrqmt_required = true;
 		}
 	}
 }
 
-// the JKkommy function
-function JKkommy(department_JKkommy)
+// the sAKFZSC function
+function sAKFZSC(department_sAKFZSC)
 {
-	// [8016] set the function logic
-	if (department_JKkommy == 1)
+	// [8017] set the function logic
+	if (department_sAKFZSC == 1)
 	{
 		jQuery('.age_groups_note').closest('.control-group').show();
 		jQuery('.cause_risk_selection_note').closest('.control-group').show();
diff --git a/admin/models/forms/company.xml b/admin/models/forms/company.xml
index 3ba4a4c7..34df0715 100644
--- a/admin/models/forms/company.xml
+++ b/admin/models/forms/company.xml
@@ -4,15 +4,15 @@
 	addfieldpath="/administrator/components/com_costbenefitprojection/models/fields"
 >
 	<fieldset name="details">
-		<!-- [11027] Default Fields. -->
-		<!-- [11028] Id Field. Type: Text (joomla) -->
+		<!-- [11028] Default Fields. -->
+		<!-- [11029] Id Field. Type: Text (joomla) -->
 		<field
 			name="id"
 			type="text" class="readonly" label="JGLOBAL_FIELD_ID_LABEL"
 			description ="JGLOBAL_FIELD_ID_DESC" size="10" default="0"
 			readonly="true"
 		/>
-		<!-- [11035] Date Created Field. Type: Calendar (joomla) -->
+		<!-- [11036] Date Created Field. Type: Calendar (joomla) -->
 		<field
 			name="created"
 			type="calendar"
@@ -22,14 +22,14 @@
 			format="%Y-%m-%d %H:%M:%S"
 			filter="user_utc"
 		/>
-		<!-- [11046] User Created Field. Type: User (joomla) -->
+		<!-- [11047] User Created Field. Type: User (joomla) -->
 		<field
 			name="created_by"
 			type="user"
 			label="COM_COSTBENEFITPROJECTION_COMPANY_CREATED_BY_LABEL"
 			description="COM_COSTBENEFITPROJECTION_COMPANY_CREATED_BY_DESC"
 		/>
-		<!-- [11054] Published Field. Type: List (joomla) -->
+		<!-- [11055] Published Field. Type: List (joomla) -->
 		<field name="published" type="list" label="JSTATUS"
 			description="JFIELD_PUBLISHED_DESC" class="chzn-color-state"
 			filter="intval" size="1" default="1" >
@@ -42,18 +42,18 @@
 			<option value="-2">
 				JTRASHED</option>
 		</field>
-		<!-- [11069] Date Modified Field. Type: Calendar (joomla) -->
+		<!-- [11070] Date Modified Field. Type: Calendar (joomla) -->
 		<field name="modified" type="calendar" class="readonly"
 			label="JGLOBAL_FIELD_MODIFIED_LABEL" description="COM_CONTENT_FIELD_MODIFIED_DESC"
 			size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
-		<!-- [11073] User Modified Field. Type: User (joomla) -->
+		<!-- [11074] User Modified Field. Type: User (joomla) -->
 		<field name="modified_by" type="user"
 			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
 			class="readonly"
 			readonly="true"
 			filter="unset"
 		/>
-		<!-- [11083] Access Field. Type: Accesslevel (joomla) -->
+		<!-- [11084] Access Field. Type: Accesslevel (joomla) -->
 		<field name="access"
 			type="accesslevel"
 			label="JFIELD_ACCESS_LABEL"
@@ -61,7 +61,7 @@
 			default="1"
 			required="false"
 		/>
-		<!-- [11093] Ordering Field. Type: Numbers (joomla) -->
+		<!-- [11094] Ordering Field. Type: Numbers (joomla) -->
 		<field
 			name="ordering"
 			type="number"
@@ -72,7 +72,7 @@
 			size="6"
 			required="false"
 		/>
-		<!-- [11105] Version Field. Type: Text (joomla) -->
+		<!-- [11106] Version Field. Type: Text (joomla) -->
 		<field
 			name="version"
 			type="text"
@@ -83,8 +83,8 @@
 			readonly="true"
 			filter="unset"
 		/>
-		<!-- [11138] Dynamic Fields. -->
-		<!-- [11374] Name Field. Type: Text. (joomla) -->
+		<!-- [11139] Dynamic Fields. -->
+		<!-- [11375] Name Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="name"
@@ -100,7 +100,7 @@
 			message="Error! Please add company name here."
 			hint="COM_COSTBENEFITPROJECTION_COMPANY_NAME_HINT"
 		/>
-		<!-- [11374] Email Field. Type: Text. (joomla) -->
+		<!-- [11375] Email Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="email"
@@ -115,7 +115,7 @@
 			message="Error! Please add email address here."
 			hint="COM_COSTBENEFITPROJECTION_COMPANY_EMAIL_HINT"
 		/>
-		<!-- [11495] User Field. Type: Memberuser. (custom) -->
+		<!-- [11496] User Field. Type: Memberuser. (custom) -->
 		<field
 			type="memberuser"
 			name="user"
@@ -123,7 +123,7 @@
 			required="false"
 			hint="COM_COSTBENEFITPROJECTION_COMPANY_USER_HINT"
 		/>
-		<!-- [11288] Department Field. Type: Radio. (joomla) -->
+		<!-- [11289] Department Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
 			name="department"
@@ -131,13 +131,13 @@
 			class="btn-group"
 			default="1"
 			required="true">
-			<!-- [11360] Option Set. -->
+			<!-- [11361] Option Set. -->
 			<option value="1">
 				COM_COSTBENEFITPROJECTION_COMPANY_BASIC</option>
 			<option value="2">
 				COM_COSTBENEFITPROJECTION_COMPANY_ADVANCED</option>
 		</field>
-		<!-- [11495] Country Field. Type: Countries. (custom) -->
+		<!-- [11496] Country Field. Type: Countries. (custom) -->
 		<field
 			type="countries"
 			name="country"
@@ -148,7 +148,7 @@
 			default="0"
 			required="true"
 		/>
-		<!-- [11495] Serviceprovider Field. Type: Serviceprovider. (custom) -->
+		<!-- [11496] Serviceprovider Field. Type: Serviceprovider. (custom) -->
 		<field
 			type="serviceprovider"
 			name="serviceprovider"
@@ -159,7 +159,7 @@
 			required="true"
 			button="true"
 		/>
-		<!-- [11288] Per Field. Type: Radio. (joomla) -->
+		<!-- [11289] Per Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
 			name="per"
@@ -168,13 +168,13 @@
 			class="btn-group btn-group-yesno"
 			default="1"
 			required="true">
-			<!-- [11360] Option Set. -->
+			<!-- [11361] Option Set. -->
 			<option value="1">
 				COM_COSTBENEFITPROJECTION_COMPANY_OPEN</option>
 			<option value="0">
 				COM_COSTBENEFITPROJECTION_COMPANY_LOCKED</option>
 		</field>
-		<!-- [11374] Medical_turnovers_males Field. Type: Text. (joomla) -->
+		<!-- [11375] Medical_turnovers_males Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="medical_turnovers_males"
@@ -190,7 +190,7 @@
 			message="Error! Please add total number of medical turnovers for males here."
 			hint="COM_COSTBENEFITPROJECTION_COMPANY_MEDICAL_TURNOVERS_MALES_HINT"
 		/>
-		<!-- [11374] Sick_leave_males Field. Type: Text. (joomla) -->
+		<!-- [11375] Sick_leave_males Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="sick_leave_males"
@@ -206,7 +206,7 @@
 			message="Error! Please add total number of sick leave days for males here."
 			hint="COM_COSTBENEFITPROJECTION_COMPANY_SICK_LEAVE_MALES_HINT"
 		/>
-		<!-- [11374] Males Field. Type: Text. (joomla) -->
+		<!-- [11375] Males Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="males"
@@ -222,7 +222,7 @@
 			message="Error! Please add total male employees here."
 			hint="COM_COSTBENEFITPROJECTION_COMPANY_MALES_HINT"
 		/>
-		<!-- [11495] Causesrisks Field. Type: Causesriskscheck. (custom) -->
+		<!-- [11496] Causesrisks Field. Type: Causesriskscheck. (custom) -->
 		<field
 			type="causesriskscheck"
 			name="causesrisks"
@@ -230,9 +230,9 @@
 			class="list_class"
 			required="true"
 		/>
-		<!-- [11388] Age_groups_note Field. Type: Note. A None Database Field. (joomla) -->
+		<!-- [11389] Age_groups_note Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="age_groups_note" label="COM_COSTBENEFITPROJECTION_COMPANY_AGE_GROUPS_NOTE_LABEL" description="COM_COSTBENEFITPROJECTION_COMPANY_AGE_GROUPS_NOTE_DESCRIPTION" class="alert alert-info age_groups_note" />
-		<!-- [11405] Percentfemale Field. Type: Repeatable. (joomla) -->
+		<!-- [11406] Percentfemale Field. Type: Repeatable. (joomla) -->
 		<field
 			type="repeatable"
 			name="percentfemale"
@@ -245,7 +245,7 @@
 			maximum="10">
 			<fields name="percentfemale_fields" label="">
 				<fieldset hidden="true" name="percentfemale_modal" repeat="true">
-					<!-- [11288] Age Field. Type: List. (joomla) -->
+					<!-- [11289] Age Field. Type: List. (joomla) -->
 					<field
 						type="list"
 						name="age"
@@ -253,7 +253,7 @@
 						class="list_class"
 						multiple="false"
 						filter="CMD">
-						<!-- [11360] Option Set. -->
+						<!-- [11361] Option Set. -->
 						<option value="15-19">
 							COM_COSTBENEFITPROJECTION_COMPANY_FIFTEENNINETEEN</option>
 						<option value="20-24">
@@ -275,7 +275,7 @@
 						<option value="60-64">
 							COM_COSTBENEFITPROJECTION_COMPANY_SIXTYSIXTY_FOUR</option>
 					</field>
-					<!-- [11374] Percent Field. Type: Text. (joomla) -->
+					<!-- [11375] Percent Field. Type: Text. (joomla) -->
 					<field
 						type="text"
 						name="percent"
@@ -292,7 +292,7 @@
 				</fieldset>
 			</fields>
 		</field>
-		<!-- [11374] Females Field. Type: Text. (joomla) -->
+		<!-- [11375] Females Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="females"
@@ -308,7 +308,7 @@
 			message="Error! Please add total female employees here."
 			hint="COM_COSTBENEFITPROJECTION_COMPANY_FEMALES_HINT"
 		/>
-		<!-- [11495] Datayear Field. Type: Datayear. (custom) -->
+		<!-- [11496] Datayear Field. Type: Datayear. (custom) -->
 		<field
 			type="datayear"
 			name="datayear"
@@ -318,7 +318,7 @@
 			multiple="false"
 			default="0"
 		/>
-		<!-- [11374] Medical_turnovers_females Field. Type: Text. (joomla) -->
+		<!-- [11375] Medical_turnovers_females Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="medical_turnovers_females"
@@ -334,7 +334,7 @@
 			message="Error! Please add total number of medical turnovers for females here."
 			hint="COM_COSTBENEFITPROJECTION_COMPANY_MEDICAL_TURNOVERS_FEMALES_HINT"
 		/>
-		<!-- [11374] Working_days Field. Type: Integer. (joomla) -->
+		<!-- [11375] Working_days Field. Type: Integer. (joomla) -->
 		<field
 			type="integer"
 			name="working_days"
@@ -347,7 +347,7 @@
 			last="365"
 			step="1"
 		/>
-		<!-- [11374] Sick_leave_females Field. Type: Text. (joomla) -->
+		<!-- [11375] Sick_leave_females Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="sick_leave_females"
@@ -363,7 +363,7 @@
 			message="Error! Please add total number of sick leave days for females here."
 			hint="COM_COSTBENEFITPROJECTION_COMPANY_SICK_LEAVE_FEMALES_HINT"
 		/>
-		<!-- [11374] Total_salary Field. Type: Text. (joomla) -->
+		<!-- [11375] Total_salary Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="total_salary"
@@ -379,7 +379,7 @@
 			message="Error! Please add total salary here."
 			hint="COM_COSTBENEFITPROJECTION_COMPANY_TOTAL_SALARY_HINT"
 		/>
-		<!-- [11405] Percentmale Field. Type: Repeatable. (joomla) -->
+		<!-- [11406] Percentmale Field. Type: Repeatable. (joomla) -->
 		<field
 			type="repeatable"
 			name="percentmale"
@@ -392,7 +392,7 @@
 			maximum="10">
 			<fields name="percentmale_fields" label="">
 				<fieldset hidden="true" name="percentmale_modal" repeat="true">
-					<!-- [11288] Age Field. Type: List. (joomla) -->
+					<!-- [11289] Age Field. Type: List. (joomla) -->
 					<field
 						type="list"
 						name="age"
@@ -400,7 +400,7 @@
 						class="list_class"
 						multiple="false"
 						filter="CMD">
-						<!-- [11360] Option Set. -->
+						<!-- [11361] Option Set. -->
 						<option value="15-19">
 							COM_COSTBENEFITPROJECTION_COMPANY_FIFTEENNINETEEN</option>
 						<option value="20-24">
@@ -422,7 +422,7 @@
 						<option value="60-64">
 							COM_COSTBENEFITPROJECTION_COMPANY_SIXTYSIXTY_FOUR</option>
 					</field>
-					<!-- [11374] Percent Field. Type: Text. (joomla) -->
+					<!-- [11375] Percent Field. Type: Text. (joomla) -->
 					<field
 						type="text"
 						name="percent"
@@ -439,7 +439,7 @@
 				</fieldset>
 			</fields>
 		</field>
-		<!-- [11374] Total_healthcare Field. Type: Text. (joomla) -->
+		<!-- [11375] Total_healthcare Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="total_healthcare"
@@ -455,9 +455,9 @@
 			message="Error! Please add total healthcare costs here."
 			hint="COM_COSTBENEFITPROJECTION_COMPANY_TOTAL_HEALTHCARE_HINT"
 		/>
-		<!-- [11388] Cause_risk_selection_note Field. Type: Note. A None Database Field. (joomla) -->
+		<!-- [11389] Cause_risk_selection_note Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="cause_risk_selection_note" label="COM_COSTBENEFITPROJECTION_COMPANY_CAUSE_RISK_SELECTION_NOTE_LABEL" description="COM_COSTBENEFITPROJECTION_COMPANY_CAUSE_RISK_SELECTION_NOTE_DESCRIPTION" class="alert alert-info cause_risk_selection_note" />
-		<!-- [11374] Productivity_losses Field. Type: Text. (joomla) -->
+		<!-- [11375] Productivity_losses Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="productivity_losses"
@@ -473,7 +473,7 @@
 			message="Error! Please add medical turnover cost factor here."
 			hint="COM_COSTBENEFITPROJECTION_COMPANY_PRODUCTIVITY_LOSSES_HINT"
 		/>
-		<!-- [11374] Not_required Field. Type: Hidden. (joomla) -->
+		<!-- [11375] Not_required Field. Type: Hidden. (joomla) -->
 		<field
 			type="hidden"
 			name="not_required"
@@ -481,15 +481,15 @@
 		/>
 	</fieldset>
 	
-	<!-- [10061] Access Control Fields. -->
+	<!-- [10062] Access Control Fields. -->
 	<fieldset name="accesscontrol">
-		<!-- [10063] Asset Id Field. Type: Hidden (joomla) -->
+		<!-- [10064] Asset Id Field. Type: Hidden (joomla) -->
 		<field
 			name="asset_id"
 			type="hidden"
 			filter="unset"
 		/>
-		<!-- [10069] Rules Field. Type: Rules (joomla) -->
+		<!-- [10070] Rules Field. Type: Rules (joomla) -->
 		<field
 			name="rules"
 			type="rules"
diff --git a/admin/models/forms/country.js b/admin/models/forms/country.js
index 185c6cbd..65b6f3dc 100644
--- a/admin/models/forms/country.js
+++ b/admin/models/forms/country.js
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/models/forms/country.xml b/admin/models/forms/country.xml
index f13abad2..e6b23a73 100644
--- a/admin/models/forms/country.xml
+++ b/admin/models/forms/country.xml
@@ -4,15 +4,15 @@
 	addfieldpath="/administrator/components/com_costbenefitprojection/models/fields"
 >
 	<fieldset name="details">
-		<!-- [11027] Default Fields. -->
-		<!-- [11028] Id Field. Type: Text (joomla) -->
+		<!-- [11028] Default Fields. -->
+		<!-- [11029] Id Field. Type: Text (joomla) -->
 		<field
 			name="id"
 			type="text" class="readonly" label="JGLOBAL_FIELD_ID_LABEL"
 			description ="JGLOBAL_FIELD_ID_DESC" size="10" default="0"
 			readonly="true"
 		/>
-		<!-- [11035] Date Created Field. Type: Calendar (joomla) -->
+		<!-- [11036] Date Created Field. Type: Calendar (joomla) -->
 		<field
 			name="created"
 			type="calendar"
@@ -22,14 +22,14 @@
 			format="%Y-%m-%d %H:%M:%S"
 			filter="user_utc"
 		/>
-		<!-- [11046] User Created Field. Type: User (joomla) -->
+		<!-- [11047] User Created Field. Type: User (joomla) -->
 		<field
 			name="created_by"
 			type="user"
 			label="COM_COSTBENEFITPROJECTION_COUNTRY_CREATED_BY_LABEL"
 			description="COM_COSTBENEFITPROJECTION_COUNTRY_CREATED_BY_DESC"
 		/>
-		<!-- [11054] Published Field. Type: List (joomla) -->
+		<!-- [11055] Published Field. Type: List (joomla) -->
 		<field name="published" type="list" label="JSTATUS"
 			description="JFIELD_PUBLISHED_DESC" class="chzn-color-state"
 			filter="intval" size="1" default="1" >
@@ -42,18 +42,18 @@
 			<option value="-2">
 				JTRASHED</option>
 		</field>
-		<!-- [11069] Date Modified Field. Type: Calendar (joomla) -->
+		<!-- [11070] Date Modified Field. Type: Calendar (joomla) -->
 		<field name="modified" type="calendar" class="readonly"
 			label="JGLOBAL_FIELD_MODIFIED_LABEL" description="COM_CONTENT_FIELD_MODIFIED_DESC"
 			size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
-		<!-- [11073] User Modified Field. Type: User (joomla) -->
+		<!-- [11074] User Modified Field. Type: User (joomla) -->
 		<field name="modified_by" type="user"
 			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
 			class="readonly"
 			readonly="true"
 			filter="unset"
 		/>
-		<!-- [11083] Access Field. Type: Accesslevel (joomla) -->
+		<!-- [11084] Access Field. Type: Accesslevel (joomla) -->
 		<field name="access"
 			type="accesslevel"
 			label="JFIELD_ACCESS_LABEL"
@@ -61,7 +61,7 @@
 			default="1"
 			required="false"
 		/>
-		<!-- [11093] Ordering Field. Type: Numbers (joomla) -->
+		<!-- [11094] Ordering Field. Type: Numbers (joomla) -->
 		<field
 			name="ordering"
 			type="number"
@@ -72,7 +72,7 @@
 			size="6"
 			required="false"
 		/>
-		<!-- [11105] Version Field. Type: Text (joomla) -->
+		<!-- [11106] Version Field. Type: Text (joomla) -->
 		<field
 			name="version"
 			type="text"
@@ -83,8 +83,8 @@
 			readonly="true"
 			filter="unset"
 		/>
-		<!-- [11138] Dynamic Fields. -->
-		<!-- [11374] Name Field. Type: Text. (joomla) -->
+		<!-- [11139] Dynamic Fields. -->
+		<!-- [11375] Name Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="name"
@@ -100,14 +100,14 @@
 			message="Error! Please add name here."
 			hint="COM_COSTBENEFITPROJECTION_COUNTRY_NAME_HINT"
 		/>
-		<!-- [11495] User Field. Type: Countryuser. (custom) -->
+		<!-- [11496] User Field. Type: Countryuser. (custom) -->
 		<field
 			type="countryuser"
 			name="user"
 			label="COM_COSTBENEFITPROJECTION_COUNTRY_USER_LABEL"
 			hint="COM_COSTBENEFITPROJECTION_COUNTRY_USER_HINT"
 		/>
-		<!-- [11495] Currency Field. Type: Currency. (custom) -->
+		<!-- [11496] Currency Field. Type: Currency. (custom) -->
 		<field
 			type="currency"
 			name="currency"
@@ -117,7 +117,7 @@
 			multiple="false"
 			required="true"
 		/>
-		<!-- [11374] Codethree Field. Type: Text. (joomla) -->
+		<!-- [11375] Codethree Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="codethree"
@@ -131,7 +131,7 @@
 			message="Error! Please add three-letter country code here."
 			hint="COM_COSTBENEFITPROJECTION_COUNTRY_CODETHREE_HINT"
 		/>
-		<!-- [11374] Codetwo Field. Type: Text. (joomla) -->
+		<!-- [11375] Codetwo Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="codetwo"
@@ -145,7 +145,7 @@
 			message="Error! Please add two-letter country code here."
 			hint="COM_COSTBENEFITPROJECTION_COUNTRY_CODETWO_HINT"
 		/>
-		<!-- [11374] Working_days Field. Type: Integer. (joomla) -->
+		<!-- [11375] Working_days Field. Type: Integer. (joomla) -->
 		<field
 			type="integer"
 			name="working_days"
@@ -158,7 +158,7 @@
 			last="365"
 			step="1"
 		/>
-		<!-- [11374] Productivity_losses Field. Type: Text. (joomla) -->
+		<!-- [11375] Productivity_losses Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="productivity_losses"
@@ -174,7 +174,7 @@
 			message="Error! Please add productivity losses here."
 			hint="COM_COSTBENEFITPROJECTION_COUNTRY_PRODUCTIVITY_LOSSES_HINT"
 		/>
-		<!-- [11495] Datayear Field. Type: Datayear. (custom) -->
+		<!-- [11496] Datayear Field. Type: Datayear. (custom) -->
 		<field
 			type="datayear"
 			name="datayear"
@@ -184,7 +184,7 @@
 			multiple="false"
 			default="0"
 		/>
-		<!-- [11374] Worldzone Field. Type: Text. (joomla) -->
+		<!-- [11375] Worldzone Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="worldzone"
@@ -198,7 +198,7 @@
 			message="Error! Please add zone code here."
 			hint="COM_COSTBENEFITPROJECTION_COUNTRY_WORLDZONE_HINT"
 		/>
-		<!-- [11374] Publicaddress Field. Type: Editor. (joomla) -->
+		<!-- [11375] Publicaddress Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
 			name="publicaddress"
@@ -208,7 +208,7 @@
 			buttons="false"
 			filter="safehtml"
 		/>
-		<!-- [11374] Publicemail Field. Type: Text. (joomla) -->
+		<!-- [11375] Publicemail Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="publicemail"
@@ -222,7 +222,7 @@
 			message="Error! Please public email address here."
 			hint="COM_COSTBENEFITPROJECTION_COUNTRY_PUBLICEMAIL_HINT"
 		/>
-		<!-- [11405] Percentfemale Field. Type: Repeatable. (joomla) -->
+		<!-- [11406] Percentfemale Field. Type: Repeatable. (joomla) -->
 		<field
 			type="repeatable"
 			name="percentfemale"
@@ -235,7 +235,7 @@
 			maximum="10">
 			<fields name="percentfemale_fields" label="">
 				<fieldset hidden="true" name="percentfemale_modal" repeat="true">
-					<!-- [11288] Age Field. Type: List. (joomla) -->
+					<!-- [11289] Age Field. Type: List. (joomla) -->
 					<field
 						type="list"
 						name="age"
@@ -243,7 +243,7 @@
 						class="list_class"
 						multiple="false"
 						filter="CMD">
-						<!-- [11360] Option Set. -->
+						<!-- [11361] Option Set. -->
 						<option value="15-19">
 							COM_COSTBENEFITPROJECTION_COUNTRY_FIFTEENNINETEEN</option>
 						<option value="20-24">
@@ -265,7 +265,7 @@
 						<option value="60-64">
 							COM_COSTBENEFITPROJECTION_COUNTRY_SIXTYSIXTY_FOUR</option>
 					</field>
-					<!-- [11374] Percent Field. Type: Text. (joomla) -->
+					<!-- [11375] Percent Field. Type: Text. (joomla) -->
 					<field
 						type="text"
 						name="percent"
@@ -282,7 +282,7 @@
 				</fieldset>
 			</fields>
 		</field>
-		<!-- [11374] Alias Field. Type: Text. (joomla) -->
+		<!-- [11375] Alias Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="alias"
@@ -291,7 +291,7 @@
 			filter="STRING"
 			hint="COM_COSTBENEFITPROJECTION_COUNTRY_ALIAS_HINT"
 		/>
-		<!-- [11405] Maledeath Field. Type: Repeatable. (joomla) -->
+		<!-- [11406] Maledeath Field. Type: Repeatable. (joomla) -->
 		<field
 			type="repeatable"
 			name="maledeath"
@@ -303,7 +303,7 @@
 			icon="list">
 			<fields name="maledeath_fields" label="">
 				<fieldset hidden="true" name="maledeath_modal" repeat="true">
-					<!-- [11288] Age Field. Type: List. (joomla) -->
+					<!-- [11289] Age Field. Type: List. (joomla) -->
 					<field
 						type="list"
 						name="age"
@@ -311,7 +311,7 @@
 						class="list_class"
 						multiple="false"
 						filter="CMD">
-						<!-- [11360] Option Set. -->
+						<!-- [11361] Option Set. -->
 						<option value="15-19">
 							COM_COSTBENEFITPROJECTION_COUNTRY_FIFTEENNINETEEN</option>
 						<option value="20-24">
@@ -333,7 +333,7 @@
 						<option value="60-64">
 							COM_COSTBENEFITPROJECTION_COUNTRY_SIXTYSIXTY_FOUR</option>
 					</field>
-					<!-- [11374] Number Field. Type: Text. (joomla) -->
+					<!-- [11375] Number Field. Type: Text. (joomla) -->
 					<field
 						type="text"
 						name="number"
@@ -347,7 +347,7 @@
 						message="Error! Please add number here."
 						hint="COM_COSTBENEFITPROJECTION_COUNTRY_NUMBER_HINT"
 					/>
-					<!-- [11288] Year Field. Type: List. (joomla) -->
+					<!-- [11289] Year Field. Type: List. (joomla) -->
 					<field
 						type="list"
 						name="year"
@@ -355,7 +355,7 @@
 						class="list_class"
 						multiple="false"
 						filter="INT">
-						<!-- [11360] Option Set. -->
+						<!-- [11361] Option Set. -->
 						<option value="">
 							COM_COSTBENEFITPROJECTION_COUNTRY_SELECT_A_YEAR</option>
 						<option value="2010">
@@ -392,7 +392,7 @@
 				</fieldset>
 			</fields>
 		</field>
-		<!-- [11374] Publicname Field. Type: Text. (joomla) -->
+		<!-- [11375] Publicname Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="publicname"
@@ -407,7 +407,7 @@
 			message="Error! Please add public name here."
 			hint="COM_COSTBENEFITPROJECTION_COUNTRY_PUBLICNAME_HINT"
 		/>
-		<!-- [11405] Maleyld Field. Type: Repeatable. (joomla) -->
+		<!-- [11406] Maleyld Field. Type: Repeatable. (joomla) -->
 		<field
 			type="repeatable"
 			name="maleyld"
@@ -419,7 +419,7 @@
 			icon="list">
 			<fields name="maleyld_fields" label="">
 				<fieldset hidden="true" name="maleyld_modal" repeat="true">
-					<!-- [11288] Age Field. Type: List. (joomla) -->
+					<!-- [11289] Age Field. Type: List. (joomla) -->
 					<field
 						type="list"
 						name="age"
@@ -427,7 +427,7 @@
 						class="list_class"
 						multiple="false"
 						filter="CMD">
-						<!-- [11360] Option Set. -->
+						<!-- [11361] Option Set. -->
 						<option value="15-19">
 							COM_COSTBENEFITPROJECTION_COUNTRY_FIFTEENNINETEEN</option>
 						<option value="20-24">
@@ -449,7 +449,7 @@
 						<option value="60-64">
 							COM_COSTBENEFITPROJECTION_COUNTRY_SIXTYSIXTY_FOUR</option>
 					</field>
-					<!-- [11374] Number Field. Type: Text. (joomla) -->
+					<!-- [11375] Number Field. Type: Text. (joomla) -->
 					<field
 						type="text"
 						name="number"
@@ -463,7 +463,7 @@
 						message="Error! Please add number here."
 						hint="COM_COSTBENEFITPROJECTION_COUNTRY_NUMBER_HINT"
 					/>
-					<!-- [11288] Year Field. Type: List. (joomla) -->
+					<!-- [11289] Year Field. Type: List. (joomla) -->
 					<field
 						type="list"
 						name="year"
@@ -471,7 +471,7 @@
 						class="list_class"
 						multiple="false"
 						filter="INT">
-						<!-- [11360] Option Set. -->
+						<!-- [11361] Option Set. -->
 						<option value="">
 							COM_COSTBENEFITPROJECTION_COUNTRY_SELECT_A_YEAR</option>
 						<option value="2010">
@@ -508,7 +508,7 @@
 				</fieldset>
 			</fields>
 		</field>
-		<!-- [11374] Publicnumber Field. Type: Tel. (joomla) -->
+		<!-- [11375] Publicnumber Field. Type: Tel. (joomla) -->
 		<field
 			type="tel"
 			name="publicnumber"
@@ -522,7 +522,7 @@
 			message="Error! Please add public phone number here."
 			hint="COM_COSTBENEFITPROJECTION_COUNTRY_PUBLICNUMBER_HINT"
 		/>
-		<!-- [11374] Presenteeism Field. Type: Text. (joomla) -->
+		<!-- [11375] Presenteeism Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="presenteeism"
@@ -538,7 +538,7 @@
 			message="Error! Please add presenteeism constant here."
 			hint="COM_COSTBENEFITPROJECTION_COUNTRY_PRESENTEEISM_HINT"
 		/>
-		<!-- [11405] Percentmale Field. Type: Repeatable. (joomla) -->
+		<!-- [11406] Percentmale Field. Type: Repeatable. (joomla) -->
 		<field
 			type="repeatable"
 			name="percentmale"
@@ -551,7 +551,7 @@
 			maximum="10">
 			<fields name="percentmale_fields" label="">
 				<fieldset hidden="true" name="percentmale_modal" repeat="true">
-					<!-- [11288] Age Field. Type: List. (joomla) -->
+					<!-- [11289] Age Field. Type: List. (joomla) -->
 					<field
 						type="list"
 						name="age"
@@ -559,7 +559,7 @@
 						class="list_class"
 						multiple="false"
 						filter="CMD">
-						<!-- [11360] Option Set. -->
+						<!-- [11361] Option Set. -->
 						<option value="15-19">
 							COM_COSTBENEFITPROJECTION_COUNTRY_FIFTEENNINETEEN</option>
 						<option value="20-24">
@@ -581,7 +581,7 @@
 						<option value="60-64">
 							COM_COSTBENEFITPROJECTION_COUNTRY_SIXTYSIXTY_FOUR</option>
 					</field>
-					<!-- [11374] Percent Field. Type: Text. (joomla) -->
+					<!-- [11375] Percent Field. Type: Text. (joomla) -->
 					<field
 						type="text"
 						name="percent"
@@ -598,7 +598,7 @@
 				</fieldset>
 			</fields>
 		</field>
-		<!-- [11374] Medical_turnovers Field. Type: Text. (joomla) -->
+		<!-- [11375] Medical_turnovers Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="medical_turnovers"
@@ -614,7 +614,7 @@
 			message="Error! Please add ave. medical turnover here."
 			hint="COM_COSTBENEFITPROJECTION_COUNTRY_MEDICAL_TURNOVERS_HINT"
 		/>
-		<!-- [11495] Causesrisks Field. Type: Causesriskscheck. (custom) -->
+		<!-- [11496] Causesrisks Field. Type: Causesriskscheck. (custom) -->
 		<field
 			type="causesriskscheck"
 			name="causesrisks"
@@ -622,7 +622,7 @@
 			class="list_class"
 			required="true"
 		/>
-		<!-- [11374] Sick_leave Field. Type: Text. (joomla) -->
+		<!-- [11375] Sick_leave Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="sick_leave"
@@ -638,7 +638,7 @@
 			message="Error! Please add ave. sick leave here."
 			hint="COM_COSTBENEFITPROJECTION_COUNTRY_SICK_LEAVE_HINT"
 		/>
-		<!-- [11405] Femaledeath Field. Type: Repeatable. (joomla) -->
+		<!-- [11406] Femaledeath Field. Type: Repeatable. (joomla) -->
 		<field
 			type="repeatable"
 			name="femaledeath"
@@ -650,7 +650,7 @@
 			icon="list">
 			<fields name="femaledeath_fields" label="">
 				<fieldset hidden="true" name="femaledeath_modal" repeat="true">
-					<!-- [11288] Age Field. Type: List. (joomla) -->
+					<!-- [11289] Age Field. Type: List. (joomla) -->
 					<field
 						type="list"
 						name="age"
@@ -658,7 +658,7 @@
 						class="list_class"
 						multiple="false"
 						filter="CMD">
-						<!-- [11360] Option Set. -->
+						<!-- [11361] Option Set. -->
 						<option value="15-19">
 							COM_COSTBENEFITPROJECTION_COUNTRY_FIFTEENNINETEEN</option>
 						<option value="20-24">
@@ -680,7 +680,7 @@
 						<option value="60-64">
 							COM_COSTBENEFITPROJECTION_COUNTRY_SIXTYSIXTY_FOUR</option>
 					</field>
-					<!-- [11374] Number Field. Type: Text. (joomla) -->
+					<!-- [11375] Number Field. Type: Text. (joomla) -->
 					<field
 						type="text"
 						name="number"
@@ -694,7 +694,7 @@
 						message="Error! Please add number here."
 						hint="COM_COSTBENEFITPROJECTION_COUNTRY_NUMBER_HINT"
 					/>
-					<!-- [11288] Year Field. Type: List. (joomla) -->
+					<!-- [11289] Year Field. Type: List. (joomla) -->
 					<field
 						type="list"
 						name="year"
@@ -702,7 +702,7 @@
 						class="list_class"
 						multiple="false"
 						filter="INT">
-						<!-- [11360] Option Set. -->
+						<!-- [11361] Option Set. -->
 						<option value="">
 							COM_COSTBENEFITPROJECTION_COUNTRY_SELECT_A_YEAR</option>
 						<option value="2010">
@@ -739,7 +739,7 @@
 				</fieldset>
 			</fields>
 		</field>
-		<!-- [11374] Healthcare Field. Type: Text. (joomla) -->
+		<!-- [11375] Healthcare Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="healthcare"
@@ -755,7 +755,7 @@
 			message="Error! Please add healthcare cost here."
 			hint="COM_COSTBENEFITPROJECTION_COUNTRY_HEALTHCARE_HINT"
 		/>
-		<!-- [11405] Femaleyld Field. Type: Repeatable. (joomla) -->
+		<!-- [11406] Femaleyld Field. Type: Repeatable. (joomla) -->
 		<field
 			type="repeatable"
 			name="femaleyld"
@@ -768,7 +768,7 @@
 			maximum="10">
 			<fields name="femaleyld_fields" label="">
 				<fieldset hidden="true" name="femaleyld_modal" repeat="true">
-					<!-- [11288] Age Field. Type: List. (joomla) -->
+					<!-- [11289] Age Field. Type: List. (joomla) -->
 					<field
 						type="list"
 						name="age"
@@ -776,7 +776,7 @@
 						class="list_class"
 						multiple="false"
 						filter="CMD">
-						<!-- [11360] Option Set. -->
+						<!-- [11361] Option Set. -->
 						<option value="15-19">
 							COM_COSTBENEFITPROJECTION_COUNTRY_FIFTEENNINETEEN</option>
 						<option value="20-24">
@@ -798,7 +798,7 @@
 						<option value="60-64">
 							COM_COSTBENEFITPROJECTION_COUNTRY_SIXTYSIXTY_FOUR</option>
 					</field>
-					<!-- [11374] Number Field. Type: Text. (joomla) -->
+					<!-- [11375] Number Field. Type: Text. (joomla) -->
 					<field
 						type="text"
 						name="number"
@@ -812,7 +812,7 @@
 						message="Error! Please add number here."
 						hint="COM_COSTBENEFITPROJECTION_COUNTRY_NUMBER_HINT"
 					/>
-					<!-- [11288] Year Field. Type: List. (joomla) -->
+					<!-- [11289] Year Field. Type: List. (joomla) -->
 					<field
 						type="list"
 						name="year"
@@ -820,7 +820,7 @@
 						class="list_class"
 						multiple="false"
 						filter="INT">
-						<!-- [11360] Option Set. -->
+						<!-- [11361] Option Set. -->
 						<option value="">
 							COM_COSTBENEFITPROJECTION_COUNTRY_SELECT_A_YEAR</option>
 						<option value="2010">
@@ -859,15 +859,15 @@
 		</field>
 	</fieldset>
 	
-	<!-- [10061] Access Control Fields. -->
+	<!-- [10062] Access Control Fields. -->
 	<fieldset name="accesscontrol">
-		<!-- [10063] Asset Id Field. Type: Hidden (joomla) -->
+		<!-- [10064] Asset Id Field. Type: Hidden (joomla) -->
 		<field
 			name="asset_id"
 			type="hidden"
 			filter="unset"
 		/>
-		<!-- [10069] Rules Field. Type: Rules (joomla) -->
+		<!-- [10070] Rules Field. Type: Rules (joomla) -->
 		<field
 			name="rules"
 			type="rules"
diff --git a/admin/models/forms/currency.js b/admin/models/forms/currency.js
index d88fb567..a68ff957 100644
--- a/admin/models/forms/currency.js
+++ b/admin/models/forms/currency.js
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/models/forms/currency.xml b/admin/models/forms/currency.xml
index 85c81cc9..136c2d43 100644
--- a/admin/models/forms/currency.xml
+++ b/admin/models/forms/currency.xml
@@ -4,15 +4,15 @@
 	addfieldpath="/administrator/components/com_costbenefitprojection/models/fields"
 >
 	<fieldset name="details">
-		<!-- [11027] Default Fields. -->
-		<!-- [11028] Id Field. Type: Text (joomla) -->
+		<!-- [11028] Default Fields. -->
+		<!-- [11029] Id Field. Type: Text (joomla) -->
 		<field
 			name="id"
 			type="text" class="readonly" label="JGLOBAL_FIELD_ID_LABEL"
 			description ="JGLOBAL_FIELD_ID_DESC" size="10" default="0"
 			readonly="true"
 		/>
-		<!-- [11035] Date Created Field. Type: Calendar (joomla) -->
+		<!-- [11036] Date Created Field. Type: Calendar (joomla) -->
 		<field
 			name="created"
 			type="calendar"
@@ -22,14 +22,14 @@
 			format="%Y-%m-%d %H:%M:%S"
 			filter="user_utc"
 		/>
-		<!-- [11046] User Created Field. Type: User (joomla) -->
+		<!-- [11047] User Created Field. Type: User (joomla) -->
 		<field
 			name="created_by"
 			type="user"
 			label="COM_COSTBENEFITPROJECTION_CURRENCY_CREATED_BY_LABEL"
 			description="COM_COSTBENEFITPROJECTION_CURRENCY_CREATED_BY_DESC"
 		/>
-		<!-- [11054] Published Field. Type: List (joomla) -->
+		<!-- [11055] Published Field. Type: List (joomla) -->
 		<field name="published" type="list" label="JSTATUS"
 			description="JFIELD_PUBLISHED_DESC" class="chzn-color-state"
 			filter="intval" size="1" default="1" >
@@ -42,18 +42,18 @@
 			<option value="-2">
 				JTRASHED</option>
 		</field>
-		<!-- [11069] Date Modified Field. Type: Calendar (joomla) -->
+		<!-- [11070] Date Modified Field. Type: Calendar (joomla) -->
 		<field name="modified" type="calendar" class="readonly"
 			label="JGLOBAL_FIELD_MODIFIED_LABEL" description="COM_CONTENT_FIELD_MODIFIED_DESC"
 			size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
-		<!-- [11073] User Modified Field. Type: User (joomla) -->
+		<!-- [11074] User Modified Field. Type: User (joomla) -->
 		<field name="modified_by" type="user"
 			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
 			class="readonly"
 			readonly="true"
 			filter="unset"
 		/>
-		<!-- [11083] Access Field. Type: Accesslevel (joomla) -->
+		<!-- [11084] Access Field. Type: Accesslevel (joomla) -->
 		<field name="access"
 			type="accesslevel"
 			label="JFIELD_ACCESS_LABEL"
@@ -61,7 +61,7 @@
 			default="1"
 			required="false"
 		/>
-		<!-- [11093] Ordering Field. Type: Numbers (joomla) -->
+		<!-- [11094] Ordering Field. Type: Numbers (joomla) -->
 		<field
 			name="ordering"
 			type="number"
@@ -72,7 +72,7 @@
 			size="6"
 			required="false"
 		/>
-		<!-- [11105] Version Field. Type: Text (joomla) -->
+		<!-- [11106] Version Field. Type: Text (joomla) -->
 		<field
 			name="version"
 			type="text"
@@ -83,8 +83,8 @@
 			readonly="true"
 			filter="unset"
 		/>
-		<!-- [11138] Dynamic Fields. -->
-		<!-- [11374] Name Field. Type: Text. (joomla) -->
+		<!-- [11139] Dynamic Fields. -->
+		<!-- [11375] Name Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="name"
@@ -100,7 +100,7 @@
 			message="Error! Please add name here."
 			hint="COM_COSTBENEFITPROJECTION_CURRENCY_NAME_HINT"
 		/>
-		<!-- [11374] Codethree Field. Type: Text. (joomla) -->
+		<!-- [11375] Codethree Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="codethree"
@@ -114,7 +114,7 @@
 			message="Error! Please add three-letter currency code here."
 			hint="COM_COSTBENEFITPROJECTION_CURRENCY_CODETHREE_HINT"
 		/>
-		<!-- [11374] Numericcode Field. Type: Text. (joomla) -->
+		<!-- [11375] Numericcode Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="numericcode"
@@ -128,7 +128,7 @@
 			message="Error! Please add numeric code here."
 			hint="COM_COSTBENEFITPROJECTION_CURRENCY_NUMERICCODE_HINT"
 		/>
-		<!-- [11374] Symbol Field. Type: Text. (joomla) -->
+		<!-- [11375] Symbol Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="symbol"
@@ -142,7 +142,7 @@
 			message="Error! Please add currency symbol here."
 			hint="COM_COSTBENEFITPROJECTION_CURRENCY_SYMBOL_HINT"
 		/>
-		<!-- [11374] Alias Field. Type: Text. (joomla) -->
+		<!-- [11375] Alias Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="alias"
@@ -151,7 +151,7 @@
 			filter="STRING"
 			hint="COM_COSTBENEFITPROJECTION_CURRENCY_ALIAS_HINT"
 		/>
-		<!-- [11374] Positivestyle Field. Type: Text. (joomla) -->
+		<!-- [11375] Positivestyle Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="positivestyle"
@@ -164,7 +164,7 @@
 			message="Error! Please add currency positive style here."
 			hint="COM_COSTBENEFITPROJECTION_CURRENCY_POSITIVESTYLE_HINT"
 		/>
-		<!-- [11374] Thousands Field. Type: Text. (joomla) -->
+		<!-- [11375] Thousands Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="thousands"
@@ -176,7 +176,7 @@
 			message="Error! Please add currency thousands separator here."
 			hint="COM_COSTBENEFITPROJECTION_CURRENCY_THOUSANDS_HINT"
 		/>
-		<!-- [11374] Decimalsymbol Field. Type: Text. (joomla) -->
+		<!-- [11375] Decimalsymbol Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="decimalsymbol"
@@ -191,7 +191,7 @@
 			message="Error! Please add currency decimal symbol here."
 			hint="COM_COSTBENEFITPROJECTION_CURRENCY_DECIMALSYMBOL_HINT"
 		/>
-		<!-- [11374] Decimalplace Field. Type: Text. (joomla) -->
+		<!-- [11375] Decimalplace Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="decimalplace"
@@ -206,7 +206,7 @@
 			message="Error! Please add currency decimal place here."
 			hint="COM_COSTBENEFITPROJECTION_CURRENCY_DECIMALPLACE_HINT"
 		/>
-		<!-- [11374] Negativestyle Field. Type: Text. (joomla) -->
+		<!-- [11375] Negativestyle Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="negativestyle"
@@ -221,15 +221,15 @@
 		/>
 	</fieldset>
 	
-	<!-- [10061] Access Control Fields. -->
+	<!-- [10062] Access Control Fields. -->
 	<fieldset name="accesscontrol">
-		<!-- [10063] Asset Id Field. Type: Hidden (joomla) -->
+		<!-- [10064] Asset Id Field. Type: Hidden (joomla) -->
 		<field
 			name="asset_id"
 			type="hidden"
 			filter="unset"
 		/>
-		<!-- [10069] Rules Field. Type: Rules (joomla) -->
+		<!-- [10070] Rules Field. Type: Rules (joomla) -->
 		<field
 			name="rules"
 			type="rules"
diff --git a/admin/models/forms/health_data.js b/admin/models/forms/health_data.js
index 8d9b2dd0..7a0098d2 100644
--- a/admin/models/forms/health_data.js
+++ b/admin/models/forms/health_data.js
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/models/forms/health_data.xml b/admin/models/forms/health_data.xml
index b7cb4575..6a65b63c 100644
--- a/admin/models/forms/health_data.xml
+++ b/admin/models/forms/health_data.xml
@@ -4,15 +4,15 @@
 	addfieldpath="/administrator/components/com_costbenefitprojection/models/fields"
 >
 	<fieldset name="details">
-		<!-- [11027] Default Fields. -->
-		<!-- [11028] Id Field. Type: Text (joomla) -->
+		<!-- [11028] Default Fields. -->
+		<!-- [11029] Id Field. Type: Text (joomla) -->
 		<field
 			name="id"
 			type="text" class="readonly" label="JGLOBAL_FIELD_ID_LABEL"
 			description ="JGLOBAL_FIELD_ID_DESC" size="10" default="0"
 			readonly="true"
 		/>
-		<!-- [11035] Date Created Field. Type: Calendar (joomla) -->
+		<!-- [11036] Date Created Field. Type: Calendar (joomla) -->
 		<field
 			name="created"
 			type="calendar"
@@ -22,14 +22,14 @@
 			format="%Y-%m-%d %H:%M:%S"
 			filter="user_utc"
 		/>
-		<!-- [11046] User Created Field. Type: User (joomla) -->
+		<!-- [11047] User Created Field. Type: User (joomla) -->
 		<field
 			name="created_by"
 			type="user"
 			label="COM_COSTBENEFITPROJECTION_HEALTH_DATA_CREATED_BY_LABEL"
 			description="COM_COSTBENEFITPROJECTION_HEALTH_DATA_CREATED_BY_DESC"
 		/>
-		<!-- [11054] Published Field. Type: List (joomla) -->
+		<!-- [11055] Published Field. Type: List (joomla) -->
 		<field name="published" type="list" label="JSTATUS"
 			description="JFIELD_PUBLISHED_DESC" class="chzn-color-state"
 			filter="intval" size="1" default="1" >
@@ -42,18 +42,18 @@
 			<option value="-2">
 				JTRASHED</option>
 		</field>
-		<!-- [11069] Date Modified Field. Type: Calendar (joomla) -->
+		<!-- [11070] Date Modified Field. Type: Calendar (joomla) -->
 		<field name="modified" type="calendar" class="readonly"
 			label="JGLOBAL_FIELD_MODIFIED_LABEL" description="COM_CONTENT_FIELD_MODIFIED_DESC"
 			size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
-		<!-- [11073] User Modified Field. Type: User (joomla) -->
+		<!-- [11074] User Modified Field. Type: User (joomla) -->
 		<field name="modified_by" type="user"
 			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
 			class="readonly"
 			readonly="true"
 			filter="unset"
 		/>
-		<!-- [11083] Access Field. Type: Accesslevel (joomla) -->
+		<!-- [11084] Access Field. Type: Accesslevel (joomla) -->
 		<field name="access"
 			type="accesslevel"
 			label="JFIELD_ACCESS_LABEL"
@@ -61,7 +61,7 @@
 			default="1"
 			required="false"
 		/>
-		<!-- [11093] Ordering Field. Type: Numbers (joomla) -->
+		<!-- [11094] Ordering Field. Type: Numbers (joomla) -->
 		<field
 			name="ordering"
 			type="number"
@@ -72,7 +72,7 @@
 			size="6"
 			required="false"
 		/>
-		<!-- [11105] Version Field. Type: Text (joomla) -->
+		<!-- [11106] Version Field. Type: Text (joomla) -->
 		<field
 			name="version"
 			type="text"
@@ -83,8 +83,8 @@
 			readonly="true"
 			filter="unset"
 		/>
-		<!-- [11138] Dynamic Fields. -->
-		<!-- [11495] Causerisk Field. Type: Causesrisks. (custom) -->
+		<!-- [11139] Dynamic Fields. -->
+		<!-- [11496] Causerisk Field. Type: Causesrisks. (custom) -->
 		<field
 			type="causesrisks"
 			name="causerisk"
@@ -94,7 +94,7 @@
 			multiple="false"
 			default="0"
 		/>
-		<!-- [11288] Year Field. Type: List. (joomla) -->
+		<!-- [11289] Year Field. Type: List. (joomla) -->
 		<field
 			type="list"
 			name="year"
@@ -103,7 +103,7 @@
 			multiple="false"
 			filter="INT"
 			required="true">
-			<!-- [11360] Option Set. -->
+			<!-- [11361] Option Set. -->
 			<option value="">
 				COM_COSTBENEFITPROJECTION_HEALTH_DATA_SELECT_A_YEAR</option>
 			<option value="2010">
@@ -137,7 +137,7 @@
 			<option value="2024">
 				COM_COSTBENEFITPROJECTION_HEALTH_DATA_TWO_THOUSAND_AND_TWENTY_FOUR</option>
 		</field>
-		<!-- [11495] Country Field. Type: Countries. (custom) -->
+		<!-- [11496] Country Field. Type: Countries. (custom) -->
 		<field
 			type="countries"
 			name="country"
@@ -148,7 +148,7 @@
 			default="0"
 			required="true"
 		/>
-		<!-- [11405] Femaledeath Field. Type: Repeatable. (joomla) -->
+		<!-- [11406] Femaledeath Field. Type: Repeatable. (joomla) -->
 		<field
 			type="repeatable"
 			name="femaledeath"
@@ -161,7 +161,7 @@
 			maximum="10">
 			<fields name="femaledeath_fields" label="">
 				<fieldset hidden="true" name="femaledeath_modal" repeat="true">
-					<!-- [11288] Age Field. Type: List. (joomla) -->
+					<!-- [11289] Age Field. Type: List. (joomla) -->
 					<field
 						type="list"
 						name="age"
@@ -169,7 +169,7 @@
 						class="list_class"
 						multiple="false"
 						filter="CMD">
-						<!-- [11360] Option Set. -->
+						<!-- [11361] Option Set. -->
 						<option value="15-19">
 							COM_COSTBENEFITPROJECTION_HEALTH_DATA_FIFTEENNINETEEN</option>
 						<option value="20-24">
@@ -191,7 +191,7 @@
 						<option value="60-64">
 							COM_COSTBENEFITPROJECTION_HEALTH_DATA_SIXTYSIXTY_FOUR</option>
 					</field>
-					<!-- [11374] Number Field. Type: Text. (joomla) -->
+					<!-- [11375] Number Field. Type: Text. (joomla) -->
 					<field
 						type="text"
 						name="number"
@@ -208,7 +208,7 @@
 				</fieldset>
 			</fields>
 		</field>
-		<!-- [11405] Maleyld Field. Type: Repeatable. (joomla) -->
+		<!-- [11406] Maleyld Field. Type: Repeatable. (joomla) -->
 		<field
 			type="repeatable"
 			name="maleyld"
@@ -221,7 +221,7 @@
 			maximum="10">
 			<fields name="maleyld_fields" label="">
 				<fieldset hidden="true" name="maleyld_modal" repeat="true">
-					<!-- [11288] Age Field. Type: List. (joomla) -->
+					<!-- [11289] Age Field. Type: List. (joomla) -->
 					<field
 						type="list"
 						name="age"
@@ -229,7 +229,7 @@
 						class="list_class"
 						multiple="false"
 						filter="CMD">
-						<!-- [11360] Option Set. -->
+						<!-- [11361] Option Set. -->
 						<option value="15-19">
 							COM_COSTBENEFITPROJECTION_HEALTH_DATA_FIFTEENNINETEEN</option>
 						<option value="20-24">
@@ -251,7 +251,7 @@
 						<option value="60-64">
 							COM_COSTBENEFITPROJECTION_HEALTH_DATA_SIXTYSIXTY_FOUR</option>
 					</field>
-					<!-- [11374] Number Field. Type: Text. (joomla) -->
+					<!-- [11375] Number Field. Type: Text. (joomla) -->
 					<field
 						type="text"
 						name="number"
@@ -268,7 +268,7 @@
 				</fieldset>
 			</fields>
 		</field>
-		<!-- [11405] Maledeath Field. Type: Repeatable. (joomla) -->
+		<!-- [11406] Maledeath Field. Type: Repeatable. (joomla) -->
 		<field
 			type="repeatable"
 			name="maledeath"
@@ -281,7 +281,7 @@
 			maximum="10">
 			<fields name="maledeath_fields" label="">
 				<fieldset hidden="true" name="maledeath_modal" repeat="true">
-					<!-- [11288] Age Field. Type: List. (joomla) -->
+					<!-- [11289] Age Field. Type: List. (joomla) -->
 					<field
 						type="list"
 						name="age"
@@ -289,7 +289,7 @@
 						class="list_class"
 						multiple="false"
 						filter="CMD">
-						<!-- [11360] Option Set. -->
+						<!-- [11361] Option Set. -->
 						<option value="15-19">
 							COM_COSTBENEFITPROJECTION_HEALTH_DATA_FIFTEENNINETEEN</option>
 						<option value="20-24">
@@ -311,7 +311,7 @@
 						<option value="60-64">
 							COM_COSTBENEFITPROJECTION_HEALTH_DATA_SIXTYSIXTY_FOUR</option>
 					</field>
-					<!-- [11374] Number Field. Type: Text. (joomla) -->
+					<!-- [11375] Number Field. Type: Text. (joomla) -->
 					<field
 						type="text"
 						name="number"
@@ -328,7 +328,7 @@
 				</fieldset>
 			</fields>
 		</field>
-		<!-- [11405] Femaleyld Field. Type: Repeatable. (joomla) -->
+		<!-- [11406] Femaleyld Field. Type: Repeatable. (joomla) -->
 		<field
 			type="repeatable"
 			name="femaleyld"
@@ -341,7 +341,7 @@
 			maximum="10">
 			<fields name="femaleyld_fields" label="">
 				<fieldset hidden="true" name="femaleyld_modal" repeat="true">
-					<!-- [11288] Age Field. Type: List. (joomla) -->
+					<!-- [11289] Age Field. Type: List. (joomla) -->
 					<field
 						type="list"
 						name="age"
@@ -349,7 +349,7 @@
 						class="list_class"
 						multiple="false"
 						filter="CMD">
-						<!-- [11360] Option Set. -->
+						<!-- [11361] Option Set. -->
 						<option value="15-19">
 							COM_COSTBENEFITPROJECTION_HEALTH_DATA_FIFTEENNINETEEN</option>
 						<option value="20-24">
@@ -371,7 +371,7 @@
 						<option value="60-64">
 							COM_COSTBENEFITPROJECTION_HEALTH_DATA_SIXTYSIXTY_FOUR</option>
 					</field>
-					<!-- [11374] Number Field. Type: Text. (joomla) -->
+					<!-- [11375] Number Field. Type: Text. (joomla) -->
 					<field
 						type="text"
 						name="number"
@@ -390,15 +390,15 @@
 		</field>
 	</fieldset>
 	
-	<!-- [10061] Access Control Fields. -->
+	<!-- [10062] Access Control Fields. -->
 	<fieldset name="accesscontrol">
-		<!-- [10063] Asset Id Field. Type: Hidden (joomla) -->
+		<!-- [10064] Asset Id Field. Type: Hidden (joomla) -->
 		<field
 			name="asset_id"
 			type="hidden"
 			filter="unset"
 		/>
-		<!-- [10069] Rules Field. Type: Rules (joomla) -->
+		<!-- [10070] Rules Field. Type: Rules (joomla) -->
 		<field
 			name="rules"
 			type="rules"
diff --git a/admin/models/forms/help_document.js b/admin/models/forms/help_document.js
index c903c6f2..c7b656a2 100644
--- a/admin/models/forms/help_document.js
+++ b/admin/models/forms/help_document.js
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -17,38 +17,38 @@
 /------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_PAoOXjBorP_required = false;
-jform_lBBAnFIlWd_required = false;
-jform_bpRduNMQlg_required = false;
-jform_mdMKRGQtUd_required = false;
+jform_CiLvGkzvad_required = false;
+jform_TBqocUAltU_required = false;
+jform_dQlZimNoYJ_required = false;
+jform_BBVrdICKeD_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var location_clqPnOc = jQuery("#jform_location input[type='radio']:checked").val();
-	clqPnOc(location_clqPnOc);
+	var location_jxuQynV = jQuery("#jform_location input[type='radio']:checked").val();
+	jxuQynV(location_jxuQynV);
 
-	var location_jWExvAv = jQuery("#jform_location input[type='radio']:checked").val();
-	jWExvAv(location_jWExvAv);
+	var location_tcNfMZq = jQuery("#jform_location input[type='radio']:checked").val();
+	tcNfMZq(location_tcNfMZq);
 
-	var type_PAoOXjB = jQuery("#jform_type").val();
-	PAoOXjB(type_PAoOXjB);
+	var type_CiLvGkz = jQuery("#jform_type").val();
+	CiLvGkz(type_CiLvGkz);
 
-	var type_lBBAnFI = jQuery("#jform_type").val();
-	lBBAnFI(type_lBBAnFI);
+	var type_TBqocUA = jQuery("#jform_type").val();
+	TBqocUA(type_TBqocUA);
 
-	var type_bpRduNM = jQuery("#jform_type").val();
-	bpRduNM(type_bpRduNM);
+	var type_dQlZimN = jQuery("#jform_type").val();
+	dQlZimN(type_dQlZimN);
 
-	var target_mdMKRGQ = jQuery("#jform_target input[type='radio']:checked").val();
-	mdMKRGQ(target_mdMKRGQ);
+	var target_BBVrdIC = jQuery("#jform_target input[type='radio']:checked").val();
+	BBVrdIC(target_BBVrdIC);
 });
 
-// the clqPnOc function
-function clqPnOc(location_clqPnOc)
+// the jxuQynV function
+function jxuQynV(location_jxuQynV)
 {
-	// [8016] set the function logic
-	if (location_clqPnOc == 1)
+	// [8017] set the function logic
+	if (location_jxuQynV == 1)
 	{
 		jQuery('#jform_admin_view').closest('.control-group').show();
 	}
@@ -58,11 +58,11 @@ function clqPnOc(location_clqPnOc)
 	}
 }
 
-// the jWExvAv function
-function jWExvAv(location_jWExvAv)
+// the tcNfMZq function
+function tcNfMZq(location_tcNfMZq)
 {
-	// [8016] set the function logic
-	if (location_jWExvAv == 2)
+	// [8017] set the function logic
+	if (location_tcNfMZq == 2)
 	{
 		jQuery('#jform_site_view').closest('.control-group').show();
 	}
@@ -72,198 +72,198 @@ function jWExvAv(location_jWExvAv)
 	}
 }
 
-// the PAoOXjB function
-function PAoOXjB(type_PAoOXjB)
+// the CiLvGkz function
+function CiLvGkz(type_CiLvGkz)
 {
-	if (isSet(type_PAoOXjB) && type_PAoOXjB.constructor !== Array)
+	if (isSet(type_CiLvGkz) && type_CiLvGkz.constructor !== Array)
 	{
-		var temp_PAoOXjB = type_PAoOXjB;
-		var type_PAoOXjB = [];
-		type_PAoOXjB.push(temp_PAoOXjB);
+		var temp_CiLvGkz = type_CiLvGkz;
+		var type_CiLvGkz = [];
+		type_CiLvGkz.push(temp_CiLvGkz);
 	}
-	else if (!isSet(type_PAoOXjB))
+	else if (!isSet(type_CiLvGkz))
 	{
-		var type_PAoOXjB = [];
+		var type_CiLvGkz = [];
 	}
-	var type = type_PAoOXjB.some(type_PAoOXjB_SomeFunc);
+	var type = type_CiLvGkz.some(type_CiLvGkz_SomeFunc);
 
 
-	// [7994] set this function logic
+	// [7995] set this function logic
 	if (type)
 	{
 		jQuery('#jform_url').closest('.control-group').show();
-		if (jform_PAoOXjBorP_required)
+		if (jform_CiLvGkzvad_required)
 		{
 			updateFieldRequired('url',0);
 			jQuery('#jform_url').prop('required','required');
 			jQuery('#jform_url').attr('aria-required',true);
 			jQuery('#jform_url').addClass('required');
-			jform_PAoOXjBorP_required = false;
+			jform_CiLvGkzvad_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_url').closest('.control-group').hide();
-		if (!jform_PAoOXjBorP_required)
+		if (!jform_CiLvGkzvad_required)
 		{
 			updateFieldRequired('url',1);
 			jQuery('#jform_url').removeAttr('required');
 			jQuery('#jform_url').removeAttr('aria-required');
 			jQuery('#jform_url').removeClass('required');
-			jform_PAoOXjBorP_required = true;
+			jform_CiLvGkzvad_required = true;
 		}
 	}
 }
 
-// the PAoOXjB Some function
-function type_PAoOXjB_SomeFunc(type_PAoOXjB)
+// the CiLvGkz Some function
+function type_CiLvGkz_SomeFunc(type_CiLvGkz)
 {
-	// [7981] set the function logic
-	if (type_PAoOXjB == 3)
+	// [7982] set the function logic
+	if (type_CiLvGkz == 3)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the lBBAnFI function
-function lBBAnFI(type_lBBAnFI)
+// the TBqocUA function
+function TBqocUA(type_TBqocUA)
 {
-	if (isSet(type_lBBAnFI) && type_lBBAnFI.constructor !== Array)
+	if (isSet(type_TBqocUA) && type_TBqocUA.constructor !== Array)
 	{
-		var temp_lBBAnFI = type_lBBAnFI;
-		var type_lBBAnFI = [];
-		type_lBBAnFI.push(temp_lBBAnFI);
+		var temp_TBqocUA = type_TBqocUA;
+		var type_TBqocUA = [];
+		type_TBqocUA.push(temp_TBqocUA);
 	}
-	else if (!isSet(type_lBBAnFI))
+	else if (!isSet(type_TBqocUA))
 	{
-		var type_lBBAnFI = [];
+		var type_TBqocUA = [];
 	}
-	var type = type_lBBAnFI.some(type_lBBAnFI_SomeFunc);
+	var type = type_TBqocUA.some(type_TBqocUA_SomeFunc);
 
 
-	// [7994] set this function logic
+	// [7995] set this function logic
 	if (type)
 	{
 		jQuery('#jform_article').closest('.control-group').show();
-		if (jform_lBBAnFIlWd_required)
+		if (jform_TBqocUAltU_required)
 		{
 			updateFieldRequired('article',0);
 			jQuery('#jform_article').prop('required','required');
 			jQuery('#jform_article').attr('aria-required',true);
 			jQuery('#jform_article').addClass('required');
-			jform_lBBAnFIlWd_required = false;
+			jform_TBqocUAltU_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_article').closest('.control-group').hide();
-		if (!jform_lBBAnFIlWd_required)
+		if (!jform_TBqocUAltU_required)
 		{
 			updateFieldRequired('article',1);
 			jQuery('#jform_article').removeAttr('required');
 			jQuery('#jform_article').removeAttr('aria-required');
 			jQuery('#jform_article').removeClass('required');
-			jform_lBBAnFIlWd_required = true;
+			jform_TBqocUAltU_required = true;
 		}
 	}
 }
 
-// the lBBAnFI Some function
-function type_lBBAnFI_SomeFunc(type_lBBAnFI)
+// the TBqocUA Some function
+function type_TBqocUA_SomeFunc(type_TBqocUA)
 {
-	// [7981] set the function logic
-	if (type_lBBAnFI == 1)
+	// [7982] set the function logic
+	if (type_TBqocUA == 1)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the bpRduNM function
-function bpRduNM(type_bpRduNM)
+// the dQlZimN function
+function dQlZimN(type_dQlZimN)
 {
-	if (isSet(type_bpRduNM) && type_bpRduNM.constructor !== Array)
+	if (isSet(type_dQlZimN) && type_dQlZimN.constructor !== Array)
 	{
-		var temp_bpRduNM = type_bpRduNM;
-		var type_bpRduNM = [];
-		type_bpRduNM.push(temp_bpRduNM);
+		var temp_dQlZimN = type_dQlZimN;
+		var type_dQlZimN = [];
+		type_dQlZimN.push(temp_dQlZimN);
 	}
-	else if (!isSet(type_bpRduNM))
+	else if (!isSet(type_dQlZimN))
 	{
-		var type_bpRduNM = [];
+		var type_dQlZimN = [];
 	}
-	var type = type_bpRduNM.some(type_bpRduNM_SomeFunc);
+	var type = type_dQlZimN.some(type_dQlZimN_SomeFunc);
 
 
-	// [7994] set this function logic
+	// [7995] set this function logic
 	if (type)
 	{
 		jQuery('#jform_content-lbl').closest('.control-group').show();
-		if (jform_bpRduNMQlg_required)
+		if (jform_dQlZimNoYJ_required)
 		{
 			updateFieldRequired('content',0);
 			jQuery('#jform_content').prop('required','required');
 			jQuery('#jform_content').attr('aria-required',true);
 			jQuery('#jform_content').addClass('required');
-			jform_bpRduNMQlg_required = false;
+			jform_dQlZimNoYJ_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_content-lbl').closest('.control-group').hide();
-		if (!jform_bpRduNMQlg_required)
+		if (!jform_dQlZimNoYJ_required)
 		{
 			updateFieldRequired('content',1);
 			jQuery('#jform_content').removeAttr('required');
 			jQuery('#jform_content').removeAttr('aria-required');
 			jQuery('#jform_content').removeClass('required');
-			jform_bpRduNMQlg_required = true;
+			jform_dQlZimNoYJ_required = true;
 		}
 	}
 }
 
-// the bpRduNM Some function
-function type_bpRduNM_SomeFunc(type_bpRduNM)
+// the dQlZimN Some function
+function type_dQlZimN_SomeFunc(type_dQlZimN)
 {
-	// [7981] set the function logic
-	if (type_bpRduNM == 2)
+	// [7982] set the function logic
+	if (type_dQlZimN == 2)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the mdMKRGQ function
-function mdMKRGQ(target_mdMKRGQ)
+// the BBVrdIC function
+function BBVrdIC(target_BBVrdIC)
 {
-	// [8016] set the function logic
-	if (target_mdMKRGQ == 1)
+	// [8017] set the function logic
+	if (target_BBVrdIC == 1)
 	{
 		jQuery('#jform_groups').closest('.control-group').show();
-		if (jform_mdMKRGQtUd_required)
+		if (jform_BBVrdICKeD_required)
 		{
 			updateFieldRequired('groups',0);
 			jQuery('#jform_groups').prop('required','required');
 			jQuery('#jform_groups').attr('aria-required',true);
 			jQuery('#jform_groups').addClass('required');
-			jform_mdMKRGQtUd_required = false;
+			jform_BBVrdICKeD_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_groups').closest('.control-group').hide();
-		if (!jform_mdMKRGQtUd_required)
+		if (!jform_BBVrdICKeD_required)
 		{
 			updateFieldRequired('groups',1);
 			jQuery('#jform_groups').removeAttr('required');
 			jQuery('#jform_groups').removeAttr('aria-required');
 			jQuery('#jform_groups').removeClass('required');
-			jform_mdMKRGQtUd_required = true;
+			jform_BBVrdICKeD_required = true;
 		}
 	}
 }
diff --git a/admin/models/forms/help_document.xml b/admin/models/forms/help_document.xml
index 66f33280..c9715fc3 100644
--- a/admin/models/forms/help_document.xml
+++ b/admin/models/forms/help_document.xml
@@ -4,15 +4,15 @@
 	addfieldpath="/administrator/components/com_costbenefitprojection/models/fields"
 >
 	<fieldset name="details">
-		<!-- [11027] Default Fields. -->
-		<!-- [11028] Id Field. Type: Text (joomla) -->
+		<!-- [11028] Default Fields. -->
+		<!-- [11029] Id Field. Type: Text (joomla) -->
 		<field
 			name="id"
 			type="text" class="readonly" label="JGLOBAL_FIELD_ID_LABEL"
 			description ="JGLOBAL_FIELD_ID_DESC" size="10" default="0"
 			readonly="true"
 		/>
-		<!-- [11035] Date Created Field. Type: Calendar (joomla) -->
+		<!-- [11036] Date Created Field. Type: Calendar (joomla) -->
 		<field
 			name="created"
 			type="calendar"
@@ -22,14 +22,14 @@
 			format="%Y-%m-%d %H:%M:%S"
 			filter="user_utc"
 		/>
-		<!-- [11046] User Created Field. Type: User (joomla) -->
+		<!-- [11047] User Created Field. Type: User (joomla) -->
 		<field
 			name="created_by"
 			type="user"
 			label="COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_CREATED_BY_LABEL"
 			description="COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_CREATED_BY_DESC"
 		/>
-		<!-- [11054] Published Field. Type: List (joomla) -->
+		<!-- [11055] Published Field. Type: List (joomla) -->
 		<field name="published" type="list" label="JSTATUS"
 			description="JFIELD_PUBLISHED_DESC" class="chzn-color-state"
 			filter="intval" size="1" default="1" >
@@ -42,18 +42,18 @@
 			<option value="-2">
 				JTRASHED</option>
 		</field>
-		<!-- [11069] Date Modified Field. Type: Calendar (joomla) -->
+		<!-- [11070] Date Modified Field. Type: Calendar (joomla) -->
 		<field name="modified" type="calendar" class="readonly"
 			label="JGLOBAL_FIELD_MODIFIED_LABEL" description="COM_CONTENT_FIELD_MODIFIED_DESC"
 			size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
-		<!-- [11073] User Modified Field. Type: User (joomla) -->
+		<!-- [11074] User Modified Field. Type: User (joomla) -->
 		<field name="modified_by" type="user"
 			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
 			class="readonly"
 			readonly="true"
 			filter="unset"
 		/>
-		<!-- [11093] Ordering Field. Type: Numbers (joomla) -->
+		<!-- [11094] Ordering Field. Type: Numbers (joomla) -->
 		<field
 			name="ordering"
 			type="number"
@@ -64,7 +64,7 @@
 			size="6"
 			required="false"
 		/>
-		<!-- [11105] Version Field. Type: Text (joomla) -->
+		<!-- [11106] Version Field. Type: Text (joomla) -->
 		<field
 			name="version"
 			type="text"
@@ -75,8 +75,8 @@
 			readonly="true"
 			filter="unset"
 		/>
-		<!-- [11138] Dynamic Fields. -->
-		<!-- [11374] Title Field. Type: Text. (joomla) -->
+		<!-- [11139] Dynamic Fields. -->
+		<!-- [11375] Title Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="title"
@@ -92,7 +92,7 @@
 			message="Error! Please add title here."
 			hint="COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_TITLE_HINT"
 		/>
-		<!-- [11288] Type Field. Type: List. (joomla) -->
+		<!-- [11289] Type Field. Type: List. (joomla) -->
 		<field
 			type="list"
 			name="type"
@@ -101,7 +101,7 @@
 			class="list_class"
 			multiple="false"
 			required="true">
-			<!-- [11360] Option Set. -->
+			<!-- [11361] Option Set. -->
 			<option value="">
 				COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_SELECT_AN_OPTION</option>
 			<option value="1">
@@ -111,7 +111,7 @@
 			<option value="3">
 				COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_URL</option>
 		</field>
-		<!-- [11374] Groups Field. Type: Usergroup. (joomla) -->
+		<!-- [11375] Groups Field. Type: Usergroup. (joomla) -->
 		<field
 			type="usergroup"
 			name="groups"
@@ -120,7 +120,7 @@
 			required="true"
 			multiple="true"
 		/>
-		<!-- [11288] Location Field. Type: Radio. (joomla) -->
+		<!-- [11289] Location Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
 			name="location"
@@ -128,13 +128,13 @@
 			description="COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_LOCATION_DESCRIPTION"
 			class="btn-group"
 			required="true">
-			<!-- [11360] Option Set. -->
+			<!-- [11361] Option Set. -->
 			<option value="1">
 				COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_ADMIN</option>
 			<option value="2">
 				COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_SITE</option>
 		</field>
-		<!-- [11374] Admin_view Field. Type: Folderlist. (joomla) -->
+		<!-- [11375] Admin_view Field. Type: Folderlist. (joomla) -->
 		<field
 			type="folderlist"
 			name="admin_view"
@@ -144,7 +144,7 @@
 			hide_none="true"
 			hide_default="true"
 		/>
-		<!-- [11374] Site_view Field. Type: Folderlist. (joomla) -->
+		<!-- [11375] Site_view Field. Type: Folderlist. (joomla) -->
 		<field
 			type="folderlist"
 			name="site_view"
@@ -154,7 +154,7 @@
 			hide_none="true"
 			hide_default="true"
 		/>
-		<!-- [11288] Target Field. Type: Radio. (joomla) -->
+		<!-- [11289] Target Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
 			name="target"
@@ -162,13 +162,13 @@
 			description="COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_TARGET_DESCRIPTION"
 			class="btn-group"
 			required="true">
-			<!-- [11360] Option Set. -->
+			<!-- [11361] Option Set. -->
 			<option value="1">
 				COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_SOME</option>
 			<option value="2">
 				COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_ALL</option>
 		</field>
-		<!-- [11374] Content Field. Type: Editor. (joomla) -->
+		<!-- [11375] Content Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
 			name="content"
@@ -179,7 +179,7 @@
 			filter="safehtml"
 			required="true"
 		/>
-		<!-- [11374] Alias Field. Type: Text. (joomla) -->
+		<!-- [11375] Alias Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="alias"
@@ -188,7 +188,7 @@
 			filter="STRING"
 			hint="COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_ALIAS_HINT"
 		/>
-		<!-- [11495] Article Field. Type: Articles. (custom) -->
+		<!-- [11496] Article Field. Type: Articles. (custom) -->
 		<field
 			type="articles"
 			name="article"
@@ -198,7 +198,7 @@
 			default="0"
 			required="true"
 		/>
-		<!-- [11374] Url Field. Type: Url. (joomla) -->
+		<!-- [11375] Url Field. Type: Url. (joomla) -->
 		<field
 			type="url"
 			name="url"
@@ -213,7 +213,7 @@
 			message="Error! Please add url here."
 			hint="COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_URL_HINT"
 		/>
-		<!-- [11374] Not_required Field. Type: Hidden. (joomla) -->
+		<!-- [11375] Not_required Field. Type: Hidden. (joomla) -->
 		<field
 			type="hidden"
 			name="not_required"
@@ -221,15 +221,15 @@
 		/>
 	</fieldset>
 	
-	<!-- [10061] Access Control Fields. -->
+	<!-- [10062] Access Control Fields. -->
 	<fieldset name="accesscontrol">
-		<!-- [10063] Asset Id Field. Type: Hidden (joomla) -->
+		<!-- [10064] Asset Id Field. Type: Hidden (joomla) -->
 		<field
 			name="asset_id"
 			type="hidden"
 			filter="unset"
 		/>
-		<!-- [10069] Rules Field. Type: Rules (joomla) -->
+		<!-- [10070] Rules Field. Type: Rules (joomla) -->
 		<field
 			name="rules"
 			type="rules"
diff --git a/admin/models/forms/intervention.js b/admin/models/forms/intervention.js
index 704c9de2..074a0512 100644
--- a/admin/models/forms/intervention.js
+++ b/admin/models/forms/intervention.js
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -17,54 +17,54 @@
 /------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_ugSWqSHmgt_required = false;
+jform_WkmQDwgOQw_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var type_ugSWqSH = jQuery("#jform_type input[type='radio']:checked").val();
-	ugSWqSH(type_ugSWqSH);
+	var type_WkmQDwg = jQuery("#jform_type input[type='radio']:checked").val();
+	WkmQDwg(type_WkmQDwg);
 
-	var type_bnFuIkh = jQuery("#jform_type input[type='radio']:checked").val();
-	bnFuIkh(type_bnFuIkh);
+	var type_rAiqAEp = jQuery("#jform_type input[type='radio']:checked").val();
+	rAiqAEp(type_rAiqAEp);
 });
 
-// the ugSWqSH function
-function ugSWqSH(type_ugSWqSH)
+// the WkmQDwg function
+function WkmQDwg(type_WkmQDwg)
 {
-	// [8016] set the function logic
-	if (type_ugSWqSH == 2)
+	// [8017] set the function logic
+	if (type_WkmQDwg == 2)
 	{
 		jQuery('#jform_interventions').closest('.control-group').show();
-		if (jform_ugSWqSHmgt_required)
+		if (jform_WkmQDwgOQw_required)
 		{
 			updateFieldRequired('interventions',0);
 			jQuery('#jform_interventions').prop('required','required');
 			jQuery('#jform_interventions').attr('aria-required',true);
 			jQuery('#jform_interventions').addClass('required');
-			jform_ugSWqSHmgt_required = false;
+			jform_WkmQDwgOQw_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_interventions').closest('.control-group').hide();
-		if (!jform_ugSWqSHmgt_required)
+		if (!jform_WkmQDwgOQw_required)
 		{
 			updateFieldRequired('interventions',1);
 			jQuery('#jform_interventions').removeAttr('required');
 			jQuery('#jform_interventions').removeAttr('aria-required');
 			jQuery('#jform_interventions').removeClass('required');
-			jform_ugSWqSHmgt_required = true;
+			jform_WkmQDwgOQw_required = true;
 		}
 	}
 }
 
-// the bnFuIkh function
-function bnFuIkh(type_bnFuIkh)
+// the rAiqAEp function
+function rAiqAEp(type_rAiqAEp)
 {
-	// [8016] set the function logic
-	if (type_bnFuIkh == 1)
+	// [8017] set the function logic
+	if (type_rAiqAEp == 1)
 	{
 		jQuery('#jform_intervention').closest('.control-group').show();
 	}
diff --git a/admin/models/forms/intervention.xml b/admin/models/forms/intervention.xml
index 1a580bf2..cef1c375 100644
--- a/admin/models/forms/intervention.xml
+++ b/admin/models/forms/intervention.xml
@@ -4,15 +4,15 @@
 	addfieldpath="/administrator/components/com_costbenefitprojection/models/fields"
 >
 	<fieldset name="details">
-		<!-- [11027] Default Fields. -->
-		<!-- [11028] Id Field. Type: Text (joomla) -->
+		<!-- [11028] Default Fields. -->
+		<!-- [11029] Id Field. Type: Text (joomla) -->
 		<field
 			name="id"
 			type="text" class="readonly" label="JGLOBAL_FIELD_ID_LABEL"
 			description ="JGLOBAL_FIELD_ID_DESC" size="10" default="0"
 			readonly="true"
 		/>
-		<!-- [11035] Date Created Field. Type: Calendar (joomla) -->
+		<!-- [11036] Date Created Field. Type: Calendar (joomla) -->
 		<field
 			name="created"
 			type="calendar"
@@ -22,14 +22,14 @@
 			format="%Y-%m-%d %H:%M:%S"
 			filter="user_utc"
 		/>
-		<!-- [11046] User Created Field. Type: User (joomla) -->
+		<!-- [11047] User Created Field. Type: User (joomla) -->
 		<field
 			name="created_by"
 			type="user"
 			label="COM_COSTBENEFITPROJECTION_INTERVENTION_CREATED_BY_LABEL"
 			description="COM_COSTBENEFITPROJECTION_INTERVENTION_CREATED_BY_DESC"
 		/>
-		<!-- [11054] Published Field. Type: List (joomla) -->
+		<!-- [11055] Published Field. Type: List (joomla) -->
 		<field name="published" type="list" label="JSTATUS"
 			description="JFIELD_PUBLISHED_DESC" class="chzn-color-state"
 			filter="intval" size="1" default="1" >
@@ -42,18 +42,18 @@
 			<option value="-2">
 				JTRASHED</option>
 		</field>
-		<!-- [11069] Date Modified Field. Type: Calendar (joomla) -->
+		<!-- [11070] Date Modified Field. Type: Calendar (joomla) -->
 		<field name="modified" type="calendar" class="readonly"
 			label="JGLOBAL_FIELD_MODIFIED_LABEL" description="COM_CONTENT_FIELD_MODIFIED_DESC"
 			size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
-		<!-- [11073] User Modified Field. Type: User (joomla) -->
+		<!-- [11074] User Modified Field. Type: User (joomla) -->
 		<field name="modified_by" type="user"
 			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
 			class="readonly"
 			readonly="true"
 			filter="unset"
 		/>
-		<!-- [11093] Ordering Field. Type: Numbers (joomla) -->
+		<!-- [11094] Ordering Field. Type: Numbers (joomla) -->
 		<field
 			name="ordering"
 			type="number"
@@ -64,7 +64,7 @@
 			size="6"
 			required="false"
 		/>
-		<!-- [11105] Version Field. Type: Text (joomla) -->
+		<!-- [11106] Version Field. Type: Text (joomla) -->
 		<field
 			name="version"
 			type="text"
@@ -75,8 +75,8 @@
 			readonly="true"
 			filter="unset"
 		/>
-		<!-- [11138] Dynamic Fields. -->
-		<!-- [11374] Name Field. Type: Text. (joomla) -->
+		<!-- [11139] Dynamic Fields. -->
+		<!-- [11375] Name Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="name"
@@ -92,7 +92,7 @@
 			message="Error! Please add intervention name here."
 			hint="COM_COSTBENEFITPROJECTION_INTERVENTION_NAME_HINT"
 		/>
-		<!-- [11495] Company Field. Type: Company. (custom) -->
+		<!-- [11496] Company Field. Type: Company. (custom) -->
 		<field
 			type="company"
 			name="company"
@@ -102,7 +102,7 @@
 			default="0"
 			button="true"
 		/>
-		<!-- [11288] Type Field. Type: Radio. (joomla) -->
+		<!-- [11289] Type Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
 			name="type"
@@ -111,13 +111,13 @@
 			class="btn-group"
 			default="1"
 			required="true">
-			<!-- [11360] Option Set. -->
+			<!-- [11361] Option Set. -->
 			<option value="1">
 				COM_COSTBENEFITPROJECTION_INTERVENTION_SINGLE</option>
 			<option value="2">
 				COM_COSTBENEFITPROJECTION_INTERVENTION_CLUSTER</option>
 		</field>
-		<!-- [11374] Coverage Field. Type: Integer. (joomla) -->
+		<!-- [11375] Coverage Field. Type: Integer. (joomla) -->
 		<field
 			type="integer"
 			name="coverage"
@@ -128,7 +128,7 @@
 			last="100"
 			step="10"
 		/>
-		<!-- [11374] Duration Field. Type: Integer. (joomla) -->
+		<!-- [11375] Duration Field. Type: Integer. (joomla) -->
 		<field
 			type="integer"
 			name="duration"
@@ -140,7 +140,7 @@
 			last="20"
 			step="1"
 		/>
-		<!-- [11374] Description Field. Type: Textarea. (joomla) -->
+		<!-- [11375] Description Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
 			name="description"
@@ -152,7 +152,7 @@
 			filter="HTML"
 			hint="COM_COSTBENEFITPROJECTION_INTERVENTION_DESCRIPTION_HINT"
 		/>
-		<!-- [11405] Intervention Field. Type: Repeatable. (joomla) -->
+		<!-- [11406] Intervention Field. Type: Repeatable. (joomla) -->
 		<field
 			type="repeatable"
 			name="intervention"
@@ -165,7 +165,7 @@
 			maximum="100">
 			<fields name="intervention_fields" label="">
 				<fieldset hidden="true" name="intervention_modal" repeat="true">
-					<!-- [11495] Causerisk Field. Type: Causesrisks. (custom) -->
+					<!-- [11496] Causerisk Field. Type: Causesrisks. (custom) -->
 					<field
 						type="causesrisks"
 						name="causerisk"
@@ -175,7 +175,7 @@
 						default="0"
 						button="false"
 					/>
-					<!-- [11374] Cpe Field. Type: Text. (joomla) -->
+					<!-- [11375] Cpe Field. Type: Text. (joomla) -->
 					<field
 						type="text"
 						name="cpe"
@@ -186,7 +186,7 @@
 						class="text_area"
 						filter="INT"
 					/>
-					<!-- [11374] Mbr Field. Type: Text. (joomla) -->
+					<!-- [11375] Mbr Field. Type: Text. (joomla) -->
 					<field
 						type="text"
 						name="mbr"
@@ -197,7 +197,7 @@
 						class="text_area"
 						filter="INT"
 					/>
-					<!-- [11374] Mtr Field. Type: Text. (joomla) -->
+					<!-- [11375] Mtr Field. Type: Text. (joomla) -->
 					<field
 						type="text"
 						name="mtr"
@@ -211,7 +211,7 @@
 				</fieldset>
 			</fields>
 		</field>
-		<!-- [11374] Reference Field. Type: Textarea. (joomla) -->
+		<!-- [11375] Reference Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
 			name="reference"
@@ -223,7 +223,7 @@
 			filter="HTML"
 			hint="COM_COSTBENEFITPROJECTION_INTERVENTION_REFERENCE_HINT"
 		/>
-		<!-- [11495] Interventions Field. Type: Interventions. (custom) -->
+		<!-- [11496] Interventions Field. Type: Interventions. (custom) -->
 		<field
 			type="interventions"
 			name="interventions"
@@ -233,7 +233,7 @@
 			required="true"
 			button="false"
 		/>
-		<!-- [11288] Share Field. Type: List. (joomla) -->
+		<!-- [11289] Share Field. Type: List. (joomla) -->
 		<field
 			type="list"
 			name="share"
@@ -244,7 +244,7 @@
 			filter="INT"
 			required="true"
 			default="3">
-			<!-- [11360] Option Set. -->
+			<!-- [11361] Option Set. -->
 			<option value="3">
 				COM_COSTBENEFITPROJECTION_INTERVENTION_ALL_SERVICE_PROVIDERS_AND_ADMIN</option>
 			<option value="2">
@@ -252,7 +252,7 @@
 			<option value="1">
 				COM_COSTBENEFITPROJECTION_INTERVENTION_ONLY_ME</option>
 		</field>
-		<!-- [11374] Not_required Field. Type: Hidden. (joomla) -->
+		<!-- [11375] Not_required Field. Type: Hidden. (joomla) -->
 		<field
 			type="hidden"
 			name="not_required"
@@ -260,15 +260,15 @@
 		/>
 	</fieldset>
 	
-	<!-- [10061] Access Control Fields. -->
+	<!-- [10062] Access Control Fields. -->
 	<fieldset name="accesscontrol">
-		<!-- [10063] Asset Id Field. Type: Hidden (joomla) -->
+		<!-- [10064] Asset Id Field. Type: Hidden (joomla) -->
 		<field
 			name="asset_id"
 			type="hidden"
 			filter="unset"
 		/>
-		<!-- [10069] Rules Field. Type: Rules (joomla) -->
+		<!-- [10070] Rules Field. Type: Rules (joomla) -->
 		<field
 			name="rules"
 			type="rules"
diff --git a/admin/models/forms/scaling_factor.js b/admin/models/forms/scaling_factor.js
index 5b6b39b8..4a0e104e 100644
--- a/admin/models/forms/scaling_factor.js
+++ b/admin/models/forms/scaling_factor.js
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/models/forms/scaling_factor.xml b/admin/models/forms/scaling_factor.xml
index f8aa5712..12d74977 100644
--- a/admin/models/forms/scaling_factor.xml
+++ b/admin/models/forms/scaling_factor.xml
@@ -4,15 +4,15 @@
 	addfieldpath="/administrator/components/com_costbenefitprojection/models/fields"
 >
 	<fieldset name="details">
-		<!-- [11027] Default Fields. -->
-		<!-- [11028] Id Field. Type: Text (joomla) -->
+		<!-- [11028] Default Fields. -->
+		<!-- [11029] Id Field. Type: Text (joomla) -->
 		<field
 			name="id"
 			type="text" class="readonly" label="JGLOBAL_FIELD_ID_LABEL"
 			description ="JGLOBAL_FIELD_ID_DESC" size="10" default="0"
 			readonly="true"
 		/>
-		<!-- [11035] Date Created Field. Type: Calendar (joomla) -->
+		<!-- [11036] Date Created Field. Type: Calendar (joomla) -->
 		<field
 			name="created"
 			type="calendar"
@@ -22,14 +22,14 @@
 			format="%Y-%m-%d %H:%M:%S"
 			filter="user_utc"
 		/>
-		<!-- [11046] User Created Field. Type: User (joomla) -->
+		<!-- [11047] User Created Field. Type: User (joomla) -->
 		<field
 			name="created_by"
 			type="user"
 			label="COM_COSTBENEFITPROJECTION_SCALING_FACTOR_CREATED_BY_LABEL"
 			description="COM_COSTBENEFITPROJECTION_SCALING_FACTOR_CREATED_BY_DESC"
 		/>
-		<!-- [11054] Published Field. Type: List (joomla) -->
+		<!-- [11055] Published Field. Type: List (joomla) -->
 		<field name="published" type="list" label="JSTATUS"
 			description="JFIELD_PUBLISHED_DESC" class="chzn-color-state"
 			filter="intval" size="1" default="1" >
@@ -42,18 +42,18 @@
 			<option value="-2">
 				JTRASHED</option>
 		</field>
-		<!-- [11069] Date Modified Field. Type: Calendar (joomla) -->
+		<!-- [11070] Date Modified Field. Type: Calendar (joomla) -->
 		<field name="modified" type="calendar" class="readonly"
 			label="JGLOBAL_FIELD_MODIFIED_LABEL" description="COM_CONTENT_FIELD_MODIFIED_DESC"
 			size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
-		<!-- [11073] User Modified Field. Type: User (joomla) -->
+		<!-- [11074] User Modified Field. Type: User (joomla) -->
 		<field name="modified_by" type="user"
 			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
 			class="readonly"
 			readonly="true"
 			filter="unset"
 		/>
-		<!-- [11093] Ordering Field. Type: Numbers (joomla) -->
+		<!-- [11094] Ordering Field. Type: Numbers (joomla) -->
 		<field
 			name="ordering"
 			type="number"
@@ -64,7 +64,7 @@
 			size="6"
 			required="false"
 		/>
-		<!-- [11105] Version Field. Type: Text (joomla) -->
+		<!-- [11106] Version Field. Type: Text (joomla) -->
 		<field
 			name="version"
 			type="text"
@@ -75,8 +75,8 @@
 			readonly="true"
 			filter="unset"
 		/>
-		<!-- [11138] Dynamic Fields. -->
-		<!-- [11495] Causerisk Field. Type: Causesrisks. (custom) -->
+		<!-- [11139] Dynamic Fields. -->
+		<!-- [11496] Causerisk Field. Type: Causesrisks. (custom) -->
 		<field
 			type="causesrisks"
 			name="causerisk"
@@ -86,7 +86,7 @@
 			multiple="false"
 			default="0"
 		/>
-		<!-- [11495] Company Field. Type: Company. (custom) -->
+		<!-- [11496] Company Field. Type: Company. (custom) -->
 		<field
 			type="company"
 			name="company"
@@ -96,7 +96,7 @@
 			default="0"
 			button="true"
 		/>
-		<!-- [11374] Reference Field. Type: Textarea. (joomla) -->
+		<!-- [11375] Reference Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
 			name="reference"
@@ -108,7 +108,7 @@
 			filter="HTML"
 			hint="COM_COSTBENEFITPROJECTION_SCALING_FACTOR_REFERENCE_HINT"
 		/>
-		<!-- [11374] Yld_scaling_factor_males Field. Type: Text. (joomla) -->
+		<!-- [11375] Yld_scaling_factor_males Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="yld_scaling_factor_males"
@@ -125,7 +125,7 @@
 			message="Error! Please add scaling factor for males here."
 			hint="COM_COSTBENEFITPROJECTION_SCALING_FACTOR_YLD_SCALING_FACTOR_MALES_HINT"
 		/>
-		<!-- [11374] Yld_scaling_factor_females Field. Type: Text. (joomla) -->
+		<!-- [11375] Yld_scaling_factor_females Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="yld_scaling_factor_females"
@@ -142,7 +142,7 @@
 			message="Error! Please add scaling factor for females here."
 			hint="COM_COSTBENEFITPROJECTION_SCALING_FACTOR_YLD_SCALING_FACTOR_FEMALES_HINT"
 		/>
-		<!-- [11374] Mortality_scaling_factor_males Field. Type: Text. (joomla) -->
+		<!-- [11375] Mortality_scaling_factor_males Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="mortality_scaling_factor_males"
@@ -159,7 +159,7 @@
 			message="Error! Please add scaling factor for males here."
 			hint="COM_COSTBENEFITPROJECTION_SCALING_FACTOR_MORTALITY_SCALING_FACTOR_MALES_HINT"
 		/>
-		<!-- [11374] Mortality_scaling_factor_females Field. Type: Text. (joomla) -->
+		<!-- [11375] Mortality_scaling_factor_females Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="mortality_scaling_factor_females"
@@ -176,7 +176,7 @@
 			message="Error! Please add scaling factor for females here."
 			hint="COM_COSTBENEFITPROJECTION_SCALING_FACTOR_MORTALITY_SCALING_FACTOR_FEMALES_HINT"
 		/>
-		<!-- [11374] Presenteeism_scaling_factor_males Field. Type: Text. (joomla) -->
+		<!-- [11375] Presenteeism_scaling_factor_males Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="presenteeism_scaling_factor_males"
@@ -193,7 +193,7 @@
 			message="Error! Please add scaling factor for males here."
 			hint="COM_COSTBENEFITPROJECTION_SCALING_FACTOR_PRESENTEEISM_SCALING_FACTOR_MALES_HINT"
 		/>
-		<!-- [11374] Presenteeism_scaling_factor_females Field. Type: Text. (joomla) -->
+		<!-- [11375] Presenteeism_scaling_factor_females Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="presenteeism_scaling_factor_females"
@@ -210,7 +210,7 @@
 			message="Error! Please add scaling factor for females here."
 			hint="COM_COSTBENEFITPROJECTION_SCALING_FACTOR_PRESENTEEISM_SCALING_FACTOR_FEMALES_HINT"
 		/>
-		<!-- [11374] Health_scaling_factor Field. Type: Text. (joomla) -->
+		<!-- [11375] Health_scaling_factor Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="health_scaling_factor"
@@ -229,15 +229,15 @@
 		/>
 	</fieldset>
 	
-	<!-- [10061] Access Control Fields. -->
+	<!-- [10062] Access Control Fields. -->
 	<fieldset name="accesscontrol">
-		<!-- [10063] Asset Id Field. Type: Hidden (joomla) -->
+		<!-- [10064] Asset Id Field. Type: Hidden (joomla) -->
 		<field
 			name="asset_id"
 			type="hidden"
 			filter="unset"
 		/>
-		<!-- [10069] Rules Field. Type: Rules (joomla) -->
+		<!-- [10070] Rules Field. Type: Rules (joomla) -->
 		<field
 			name="rules"
 			type="rules"
diff --git a/admin/models/forms/service_provider.js b/admin/models/forms/service_provider.js
index a797bfc5..ec5e5329 100644
--- a/admin/models/forms/service_provider.js
+++ b/admin/models/forms/service_provider.js
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/models/forms/service_provider.xml b/admin/models/forms/service_provider.xml
index 60d185dc..14381c63 100644
--- a/admin/models/forms/service_provider.xml
+++ b/admin/models/forms/service_provider.xml
@@ -4,15 +4,15 @@
 	addfieldpath="/administrator/components/com_costbenefitprojection/models/fields"
 >
 	<fieldset name="details">
-		<!-- [11027] Default Fields. -->
-		<!-- [11028] Id Field. Type: Text (joomla) -->
+		<!-- [11028] Default Fields. -->
+		<!-- [11029] Id Field. Type: Text (joomla) -->
 		<field
 			name="id"
 			type="text" class="readonly" label="JGLOBAL_FIELD_ID_LABEL"
 			description ="JGLOBAL_FIELD_ID_DESC" size="10" default="0"
 			readonly="true"
 		/>
-		<!-- [11035] Date Created Field. Type: Calendar (joomla) -->
+		<!-- [11036] Date Created Field. Type: Calendar (joomla) -->
 		<field
 			name="created"
 			type="calendar"
@@ -22,14 +22,14 @@
 			format="%Y-%m-%d %H:%M:%S"
 			filter="user_utc"
 		/>
-		<!-- [11046] User Created Field. Type: User (joomla) -->
+		<!-- [11047] User Created Field. Type: User (joomla) -->
 		<field
 			name="created_by"
 			type="user"
 			label="COM_COSTBENEFITPROJECTION_SERVICE_PROVIDER_CREATED_BY_LABEL"
 			description="COM_COSTBENEFITPROJECTION_SERVICE_PROVIDER_CREATED_BY_DESC"
 		/>
-		<!-- [11054] Published Field. Type: List (joomla) -->
+		<!-- [11055] Published Field. Type: List (joomla) -->
 		<field name="published" type="list" label="JSTATUS"
 			description="JFIELD_PUBLISHED_DESC" class="chzn-color-state"
 			filter="intval" size="1" default="1" >
@@ -42,18 +42,18 @@
 			<option value="-2">
 				JTRASHED</option>
 		</field>
-		<!-- [11069] Date Modified Field. Type: Calendar (joomla) -->
+		<!-- [11070] Date Modified Field. Type: Calendar (joomla) -->
 		<field name="modified" type="calendar" class="readonly"
 			label="JGLOBAL_FIELD_MODIFIED_LABEL" description="COM_CONTENT_FIELD_MODIFIED_DESC"
 			size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
-		<!-- [11073] User Modified Field. Type: User (joomla) -->
+		<!-- [11074] User Modified Field. Type: User (joomla) -->
 		<field name="modified_by" type="user"
 			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
 			class="readonly"
 			readonly="true"
 			filter="unset"
 		/>
-		<!-- [11093] Ordering Field. Type: Numbers (joomla) -->
+		<!-- [11094] Ordering Field. Type: Numbers (joomla) -->
 		<field
 			name="ordering"
 			type="number"
@@ -64,7 +64,7 @@
 			size="6"
 			required="false"
 		/>
-		<!-- [11105] Version Field. Type: Text (joomla) -->
+		<!-- [11106] Version Field. Type: Text (joomla) -->
 		<field
 			name="version"
 			type="text"
@@ -75,8 +75,8 @@
 			readonly="true"
 			filter="unset"
 		/>
-		<!-- [11138] Dynamic Fields. -->
-		<!-- [11495] User Field. Type: Serviceprovideruser. (custom) -->
+		<!-- [11139] Dynamic Fields. -->
+		<!-- [11496] User Field. Type: Serviceprovideruser. (custom) -->
 		<field
 			type="serviceprovideruser"
 			name="user"
@@ -84,7 +84,7 @@
 			description="JFIELD_TITLE_DESC"
 			hint="COM_COSTBENEFITPROJECTION_SERVICE_PROVIDER_USER_HINT"
 		/>
-		<!-- [11495] Country Field. Type: Countries. (custom) -->
+		<!-- [11496] Country Field. Type: Countries. (custom) -->
 		<field
 			type="countries"
 			name="country"
@@ -95,7 +95,7 @@
 			default="0"
 			required="true"
 		/>
-		<!-- [11374] Publicname Field. Type: Text. (joomla) -->
+		<!-- [11375] Publicname Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="publicname"
@@ -110,7 +110,7 @@
 			message="Error! Please add public name here."
 			hint="COM_COSTBENEFITPROJECTION_SERVICE_PROVIDER_PUBLICNAME_HINT"
 		/>
-		<!-- [11374] Publicemail Field. Type: Text. (joomla) -->
+		<!-- [11375] Publicemail Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="publicemail"
@@ -124,7 +124,7 @@
 			message="Error! Please public email address here."
 			hint="COM_COSTBENEFITPROJECTION_SERVICE_PROVIDER_PUBLICEMAIL_HINT"
 		/>
-		<!-- [11374] Publicnumber Field. Type: Tel. (joomla) -->
+		<!-- [11375] Publicnumber Field. Type: Tel. (joomla) -->
 		<field
 			type="tel"
 			name="publicnumber"
@@ -138,7 +138,7 @@
 			message="Error! Please add public phone number here."
 			hint="COM_COSTBENEFITPROJECTION_SERVICE_PROVIDER_PUBLICNUMBER_HINT"
 		/>
-		<!-- [11374] Publicaddress Field. Type: Editor. (joomla) -->
+		<!-- [11375] Publicaddress Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
 			name="publicaddress"
@@ -148,19 +148,19 @@
 			buttons="false"
 			filter="safehtml"
 		/>
-		<!-- [11388] Public_details_note Field. Type: Note. A None Database Field. (joomla) -->
+		<!-- [11389] Public_details_note Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="public_details_note" description="COM_COSTBENEFITPROJECTION_SERVICE_PROVIDER_PUBLIC_DETAILS_NOTE_DESCRIPTION" class="alert alert-info, public_details_note" />
 	</fieldset>
 	
-	<!-- [10061] Access Control Fields. -->
+	<!-- [10062] Access Control Fields. -->
 	<fieldset name="accesscontrol">
-		<!-- [10063] Asset Id Field. Type: Hidden (joomla) -->
+		<!-- [10064] Asset Id Field. Type: Hidden (joomla) -->
 		<field
 			name="asset_id"
 			type="hidden"
 			filter="unset"
 		/>
-		<!-- [10069] Rules Field. Type: Rules (joomla) -->
+		<!-- [10070] Rules Field. Type: Rules (joomla) -->
 		<field
 			name="rules"
 			type="rules"
diff --git a/admin/models/health_data.php b/admin/models/health_data.php
index cffe42ad..1f710979 100644
--- a/admin/models/health_data.php
+++ b/admin/models/health_data.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -110,7 +110,7 @@ class CostbenefitprojectionModelHealth_data extends JModelAdmin
 	 * @since   1.6
 	 */
 	public function getForm($data = array(), $loadData = true)
-	{		// [9574] Get the form.
+	{		// [9575] Get the form.
 		$form = $this->loadForm('com_costbenefitprojection.health_data', 'health_data', array('control' => 'jform', 'load_data' => $loadData));
 
 		if (empty($form))
@@ -120,12 +120,12 @@ class CostbenefitprojectionModelHealth_data extends JModelAdmin
 
 		$jinput = JFactory::getApplication()->input;
 
-		// [9659] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first.
+		// [9660] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first.
 		if ($jinput->get('a_id'))
 		{
 			$id = $jinput->get('a_id', 0, 'INT');
 		}
-		// [9664] The back end uses id so we use that the rest of the time and set it to 0 by default.
+		// [9665] The back end uses id so we use that the rest of the time and set it to 0 by default.
 		else
 		{
 			$id = $jinput->get('id', 0, 'INT');
@@ -133,157 +133,157 @@ class CostbenefitprojectionModelHealth_data extends JModelAdmin
 
 		$user = JFactory::getUser();
 
-		// [9670] Check for existing item.
-		// [9671] Modify the form based on Edit State access controls.
+		// [9671] Check for existing item.
+		// [9672] Modify the form based on Edit State access controls.
 		if ($id != 0 && (!$user->authorise('health_data.edit.state', 'com_costbenefitprojection.health_data.' . (int) $id))
 			|| ($id == 0 && !$user->authorise('health_data.edit.state', 'com_costbenefitprojection')))
 		{
-			// [9684] Disable fields for display.
+			// [9685] Disable fields for display.
 			$form->setFieldAttribute('ordering', 'disabled', 'true');
 			$form->setFieldAttribute('published', 'disabled', 'true');
-			// [9687] Disable fields while saving.
+			// [9688] Disable fields while saving.
 			$form->setFieldAttribute('ordering', 'filter', 'unset');
 			$form->setFieldAttribute('published', 'filter', 'unset');
 		}
-		// [9692] Modify the form based on Edit Creaded By access controls.
+		// [9693] Modify the form based on Edit Creaded By access controls.
 		if (!$user->authorise('core.edit.created_by', 'com_costbenefitprojection'))
 		{
-			// [9704] Disable fields for display.
+			// [9705] Disable fields for display.
 			$form->setFieldAttribute('created_by', 'disabled', 'true');
-			// [9706] Disable fields for display.
+			// [9707] Disable fields for display.
 			$form->setFieldAttribute('created_by', 'readonly', 'true');
-			// [9708] Disable fields while saving.
+			// [9709] Disable fields while saving.
 			$form->setFieldAttribute('created_by', 'filter', 'unset');
 		}
-		// [9711] Modify the form based on Edit Creaded Date access controls.
+		// [9712] Modify the form based on Edit Creaded Date access controls.
 		if (!$user->authorise('core.edit.created', 'com_costbenefitprojection'))
 		{
-			// [9723] Disable fields for display.
+			// [9724] Disable fields for display.
 			$form->setFieldAttribute('created', 'disabled', 'true');
-			// [9725] Disable fields while saving.
+			// [9726] Disable fields while saving.
 			$form->setFieldAttribute('created', 'filter', 'unset');
 		}
-		// [9733] Modify the form based on Edit Causerisk access controls.
+		// [9734] Modify the form based on Edit Causerisk access controls.
 		if ($id != 0 && (!$user->authorise('health_data.edit.causerisk', 'com_costbenefitprojection.health_data.' . (int) $id))
 			|| ($id == 0 && !$user->authorise('health_data.edit.causerisk', 'com_costbenefitprojection')))
 		{
-			// [9737] Disable fields for display.
+			// [9738] Disable fields for display.
 			$form->setFieldAttribute('causerisk', 'disabled', 'true');
-			// [9739] Disable fields for display.
+			// [9740] Disable fields for display.
 			$form->setFieldAttribute('causerisk', 'readonly', 'true');
 			if (!$form->getValue('causerisk'))
 			{
-				// [9749] Disable fields while saving.
+				// [9750] Disable fields while saving.
 				$form->setFieldAttribute('causerisk', 'filter', 'unset');
-				// [9751] Disable fields while saving.
+				// [9752] Disable fields while saving.
 				$form->setFieldAttribute('causerisk', 'required', 'false');
 			}
 		}
-		// [9733] Modify the form based on Edit Year access controls.
+		// [9734] Modify the form based on Edit Year access controls.
 		if ($id != 0 && (!$user->authorise('health_data.edit.year', 'com_costbenefitprojection.health_data.' . (int) $id))
 			|| ($id == 0 && !$user->authorise('health_data.edit.year', 'com_costbenefitprojection')))
 		{
-			// [9737] Disable fields for display.
+			// [9738] Disable fields for display.
 			$form->setFieldAttribute('year', 'disabled', 'true');
-			// [9739] Disable fields for display.
+			// [9740] Disable fields for display.
 			$form->setFieldAttribute('year', 'readonly', 'true');
 			if (!$form->getValue('year'))
 			{
-				// [9749] Disable fields while saving.
+				// [9750] Disable fields while saving.
 				$form->setFieldAttribute('year', 'filter', 'unset');
-				// [9751] Disable fields while saving.
+				// [9752] Disable fields while saving.
 				$form->setFieldAttribute('year', 'required', 'false');
 			}
 		}
-		// [9733] Modify the form based on Edit Country access controls.
+		// [9734] Modify the form based on Edit Country access controls.
 		if ($id != 0 && (!$user->authorise('health_data.edit.country', 'com_costbenefitprojection.health_data.' . (int) $id))
 			|| ($id == 0 && !$user->authorise('health_data.edit.country', 'com_costbenefitprojection')))
 		{
-			// [9737] Disable fields for display.
+			// [9738] Disable fields for display.
 			$form->setFieldAttribute('country', 'disabled', 'true');
-			// [9739] Disable fields for display.
+			// [9740] Disable fields for display.
 			$form->setFieldAttribute('country', 'readonly', 'true');
 			if (!$form->getValue('country'))
 			{
-				// [9749] Disable fields while saving.
+				// [9750] Disable fields while saving.
 				$form->setFieldAttribute('country', 'filter', 'unset');
-				// [9751] Disable fields while saving.
+				// [9752] Disable fields while saving.
 				$form->setFieldAttribute('country', 'required', 'false');
 			}
 		}
-		// [9733] Modify the form based on Edit Femaledeath access controls.
+		// [9734] Modify the form based on Edit Femaledeath access controls.
 		if ($id != 0 && (!$user->authorise('health_data.edit.femaledeath', 'com_costbenefitprojection.health_data.' . (int) $id))
 			|| ($id == 0 && !$user->authorise('health_data.edit.femaledeath', 'com_costbenefitprojection')))
 		{
-			// [9737] Disable fields for display.
+			// [9738] Disable fields for display.
 			$form->setFieldAttribute('femaledeath', 'disabled', 'true');
-			// [9739] Disable fields for display.
+			// [9740] Disable fields for display.
 			$form->setFieldAttribute('femaledeath', 'readonly', 'true');
-			// [9743] Disable radio button for display.
+			// [9744] Disable radio button for display.
 			$class = $form->getFieldAttribute('femaledeath', 'class', '');
 			$form->setFieldAttribute('femaledeath', 'class', $class.' disabled no-click');
 			if (!$form->getValue('femaledeath'))
 			{
-				// [9749] Disable fields while saving.
+				// [9750] Disable fields while saving.
 				$form->setFieldAttribute('femaledeath', 'filter', 'unset');
-				// [9751] Disable fields while saving.
+				// [9752] Disable fields while saving.
 				$form->setFieldAttribute('femaledeath', 'required', 'false');
 			}
 		}
-		// [9733] Modify the form based on Edit Maleyld access controls.
+		// [9734] Modify the form based on Edit Maleyld access controls.
 		if ($id != 0 && (!$user->authorise('health_data.edit.maleyld', 'com_costbenefitprojection.health_data.' . (int) $id))
 			|| ($id == 0 && !$user->authorise('health_data.edit.maleyld', 'com_costbenefitprojection')))
 		{
-			// [9737] Disable fields for display.
+			// [9738] Disable fields for display.
 			$form->setFieldAttribute('maleyld', 'disabled', 'true');
-			// [9739] Disable fields for display.
+			// [9740] Disable fields for display.
 			$form->setFieldAttribute('maleyld', 'readonly', 'true');
-			// [9743] Disable radio button for display.
+			// [9744] Disable radio button for display.
 			$class = $form->getFieldAttribute('maleyld', 'class', '');
 			$form->setFieldAttribute('maleyld', 'class', $class.' disabled no-click');
 			if (!$form->getValue('maleyld'))
 			{
-				// [9749] Disable fields while saving.
+				// [9750] Disable fields while saving.
 				$form->setFieldAttribute('maleyld', 'filter', 'unset');
-				// [9751] Disable fields while saving.
+				// [9752] Disable fields while saving.
 				$form->setFieldAttribute('maleyld', 'required', 'false');
 			}
 		}
-		// [9733] Modify the form based on Edit Maledeath access controls.
+		// [9734] Modify the form based on Edit Maledeath access controls.
 		if ($id != 0 && (!$user->authorise('health_data.edit.maledeath', 'com_costbenefitprojection.health_data.' . (int) $id))
 			|| ($id == 0 && !$user->authorise('health_data.edit.maledeath', 'com_costbenefitprojection')))
 		{
-			// [9737] Disable fields for display.
+			// [9738] Disable fields for display.
 			$form->setFieldAttribute('maledeath', 'disabled', 'true');
-			// [9739] Disable fields for display.
+			// [9740] Disable fields for display.
 			$form->setFieldAttribute('maledeath', 'readonly', 'true');
-			// [9743] Disable radio button for display.
+			// [9744] Disable radio button for display.
 			$class = $form->getFieldAttribute('maledeath', 'class', '');
 			$form->setFieldAttribute('maledeath', 'class', $class.' disabled no-click');
 			if (!$form->getValue('maledeath'))
 			{
-				// [9749] Disable fields while saving.
+				// [9750] Disable fields while saving.
 				$form->setFieldAttribute('maledeath', 'filter', 'unset');
-				// [9751] Disable fields while saving.
+				// [9752] Disable fields while saving.
 				$form->setFieldAttribute('maledeath', 'required', 'false');
 			}
 		}
-		// [9733] Modify the form based on Edit Femaleyld access controls.
+		// [9734] Modify the form based on Edit Femaleyld access controls.
 		if ($id != 0 && (!$user->authorise('health_data.edit.femaleyld', 'com_costbenefitprojection.health_data.' . (int) $id))
 			|| ($id == 0 && !$user->authorise('health_data.edit.femaleyld', 'com_costbenefitprojection')))
 		{
-			// [9737] Disable fields for display.
+			// [9738] Disable fields for display.
 			$form->setFieldAttribute('femaleyld', 'disabled', 'true');
-			// [9739] Disable fields for display.
+			// [9740] Disable fields for display.
 			$form->setFieldAttribute('femaleyld', 'readonly', 'true');
-			// [9743] Disable radio button for display.
+			// [9744] Disable radio button for display.
 			$class = $form->getFieldAttribute('femaleyld', 'class', '');
 			$form->setFieldAttribute('femaleyld', 'class', $class.' disabled no-click');
 			if (!$form->getValue('femaleyld'))
 			{
-				// [9749] Disable fields while saving.
+				// [9750] Disable fields while saving.
 				$form->setFieldAttribute('femaleyld', 'filter', 'unset');
-				// [9751] Disable fields while saving.
+				// [9752] Disable fields while saving.
 				$form->setFieldAttribute('femaleyld', 'required', 'false');
 			}
 		}
@@ -320,7 +320,7 @@ class CostbenefitprojectionModelHealth_data extends JModelAdmin
 			}
 
 			$user = JFactory::getUser();
-			// [9875] The record has been set. Check the record permissions.
+			// [9876] The record has been set. Check the record permissions.
 			return $user->authorise('health_data.delete', 'com_costbenefitprojection.health_data.' . (int) $record->id);
 		}
 		return false;
@@ -342,14 +342,14 @@ class CostbenefitprojectionModelHealth_data extends JModelAdmin
 
 		if ($recordId)
 		{
-			// [9962] The record has been set. Check the record permissions.
+			// [9963] The record has been set. Check the record permissions.
 			$permission = $user->authorise('health_data.edit.state', 'com_costbenefitprojection.health_data.' . (int) $recordId);
 			if (!$permission && !is_null($permission))
 			{
 				return false;
 			}
 		}
-		// [9979] In the absense of better information, revert to the component permissions.
+		// [9980] In the absense of better information, revert to the component permissions.
 		return $user->authorise('health_data.edit.state', 'com_costbenefitprojection');
 	}
     
@@ -364,7 +364,7 @@ class CostbenefitprojectionModelHealth_data extends JModelAdmin
 	 */
 	protected function allowEdit($data = array(), $key = 'id')
 	{
-		// [9787] Check specific edit permission then general edit permission.
+		// [9788] Check specific edit permission then general edit permission.
 		$user = JFactory::getUser();
 		$recordId	= (int) isset($data[$key]) ? $data[$key] : 0;
 		if (!$user->authorise('core.options', 'com_costbenefitprojection'))
@@ -582,7 +582,7 @@ class CostbenefitprojectionModelHealth_data extends JModelAdmin
 	{
 		if (empty($this->batchSet))
 		{
-			// [4940] Set some needed variables.
+			// [4941] Set some needed variables.
 			$this->user 		= JFactory::getUser();
 			$this->table 		= $this->getTable();
 			$this->tableClassName	= get_class($this->table);
@@ -627,12 +627,12 @@ class CostbenefitprojectionModelHealth_data extends JModelAdmin
 			}
 		}
 
-		// [4960] get list of uniqe fields
+		// [4961] get list of uniqe fields
 		$uniqeFields = $this->getUniqeFields();
-		// [4962] remove move_copy from array
+		// [4963] remove move_copy from array
 		unset($values['move_copy']);
 
-		// [4965] make sure published is set
+		// [4966] make sure published is set
 		if (!isset($values['published']))
 		{
 			$values['published'] = 0;
@@ -644,21 +644,21 @@ class CostbenefitprojectionModelHealth_data extends JModelAdmin
 
 		$newIds = array();
 
-		// [5002] Parent exists so let's proceed
+		// [5003] Parent exists so let's proceed
 		while (!empty($pks))
 		{
-			// [5005] Pop the first ID off the stack
+			// [5006] Pop the first ID off the stack
 			$pk = array_shift($pks);
 
 			$this->table->reset();
 
-			// [5010] only allow copy if user may edit this item.
+			// [5011] only allow copy if user may edit this item.
 
 			if (!$this->user->authorise('health_data.edit', $contexts[$pk]))
 
 			{
 
-				// [5020] Not fatal error
+				// [5021] Not fatal error
 
 				$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 
@@ -666,19 +666,19 @@ class CostbenefitprojectionModelHealth_data extends JModelAdmin
 
 			}
 
-			// [5025] Check that the row actually exists
+			// [5026] Check that the row actually exists
 			if (!$this->table->load($pk))
 			{
 				if ($error = $this->table->getError())
 				{
-					// [5030] Fatal error
+					// [5031] Fatal error
 					$this->setError($error);
 
 					return false;
 				}
 				else
 				{
-					// [5037] Not fatal error
+					// [5038] Not fatal error
 					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 					continue;
 				}
@@ -686,7 +686,7 @@ class CostbenefitprojectionModelHealth_data extends JModelAdmin
 
 			$this->table->causerisk = $this->generateUniqe('causerisk',$this->table->causerisk);
 
-			// [5073] insert all set values
+			// [5074] insert all set values
 			if (CostbenefitprojectionHelper::checkArray($values))
 			{
 				foreach ($values as $key => $value)
@@ -698,7 +698,7 @@ class CostbenefitprojectionModelHealth_data extends JModelAdmin
 				}
 			}
 
-			// [5085] update all uniqe fields
+			// [5086] update all uniqe fields
 			if (CostbenefitprojectionHelper::checkArray($uniqeFields))
 			{
 				foreach ($uniqeFields as $uniqeField)
@@ -707,13 +707,13 @@ class CostbenefitprojectionModelHealth_data extends JModelAdmin
 				}
 			}
 
-			// [5094] Reset the ID because we are making a copy
+			// [5095] Reset the ID because we are making a copy
 			$this->table->id = 0;
 
-			// [5097] TODO: Deal with ordering?
-			// [5098] $this->table->ordering	= 1;
+			// [5098] TODO: Deal with ordering?
+			// [5099] $this->table->ordering	= 1;
 
-			// [5100] Check the row.
+			// [5101] Check the row.
 			if (!$this->table->check())
 			{
 				$this->setError($this->table->getError());
@@ -726,7 +726,7 @@ class CostbenefitprojectionModelHealth_data extends JModelAdmin
 				$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
 			}
 
-			// [5113] Store the row.
+			// [5114] Store the row.
 			if (!$this->table->store())
 			{
 				$this->setError($this->table->getError());
@@ -734,14 +734,14 @@ class CostbenefitprojectionModelHealth_data extends JModelAdmin
 				return false;
 			}
 
-			// [5121] Get the new item ID
+			// [5122] Get the new item ID
 			$newId = $this->table->get('id');
 
-			// [5124] Add the new ID to the array
+			// [5125] Add the new ID to the array
 			$newIds[$pk] = $newId;
 		}
 
-		// [5128] Clean the cache
+		// [5129] Clean the cache
 		$this->cleanCache();
 
 		return $newIds;
@@ -762,7 +762,7 @@ class CostbenefitprojectionModelHealth_data extends JModelAdmin
 	{
 		if (empty($this->batchSet))
 		{
-			// [4742] Set some needed variables.
+			// [4743] Set some needed variables.
 			$this->user		= JFactory::getUser();
 			$this->table		= $this->getTable();
 			$this->tableClassName	= get_class($this->table);
@@ -808,15 +808,15 @@ class CostbenefitprojectionModelHealth_data extends JModelAdmin
 			}
 		}
 
-		// [4764] make sure published only updates if user has the permission.
+		// [4765] make sure published only updates if user has the permission.
 		if (isset($values['published']) && !$this->canDo->get('health_data.edit.state'))
 		{
 			unset($values['published']);
 		}
-		// [4777] remove move_copy from array
+		// [4778] remove move_copy from array
 		unset($values['move_copy']);
 
-		// [4798] Parent exists so we proceed
+		// [4799] Parent exists so we proceed
 		foreach ($pks as $pk)
 		{
 			if (!$this->user->authorise('health_data.edit', $contexts[$pk]))
@@ -826,30 +826,30 @@ class CostbenefitprojectionModelHealth_data extends JModelAdmin
 				return false;
 			}
 
-			// [4815] Check that the row actually exists
+			// [4816] Check that the row actually exists
 			if (!$this->table->load($pk))
 			{
 				if ($error = $this->table->getError())
 				{
-					// [4820] Fatal error
+					// [4821] Fatal error
 					$this->setError($error);
 
 					return false;
 				}
 				else
 				{
-					// [4827] Not fatal error
+					// [4828] Not fatal error
 					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 					continue;
 				}
 			}
 
-			// [4833] insert all set values.
+			// [4834] insert all set values.
 			if (CostbenefitprojectionHelper::checkArray($values))
 			{
 				foreach ($values as $key => $value)
 				{
-					// [4838] Do special action for access.
+					// [4839] Do special action for access.
 					if ('access' == $key && strlen($value) > 0)
 					{
 						$this->table->$key = $value;
@@ -862,7 +862,7 @@ class CostbenefitprojectionModelHealth_data extends JModelAdmin
 			}
 
 
-			// [4850] Check the row.
+			// [4851] Check the row.
 			if (!$this->table->check())
 			{
 				$this->setError($this->table->getError());
@@ -875,7 +875,7 @@ class CostbenefitprojectionModelHealth_data extends JModelAdmin
 				$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
 			}
 
-			// [4863] Store the row.
+			// [4864] Store the row.
 			if (!$this->table->store())
 			{
 				$this->setError($this->table->getError());
@@ -884,7 +884,7 @@ class CostbenefitprojectionModelHealth_data extends JModelAdmin
 			}
 		}
 
-		// [4872] Clean the cache
+		// [4873] Clean the cache
 		$this->cleanCache();
 
 		return true;
@@ -922,10 +922,10 @@ class CostbenefitprojectionModelHealth_data extends JModelAdmin
 			$data['params'] = (string) $params;
 		}
 
-		// [5220] Alter the uniqe field for save as copy
+		// [5221] Alter the uniqe field for save as copy
 		if ($input->get('task') == 'save2copy')
 		{
-			// [5223] Automatic handling of other uniqe fields
+			// [5224] Automatic handling of other uniqe fields
 			$uniqeFields = $this->getUniqeFields();
 			if (CostbenefitprojectionHelper::checkArray($uniqeFields))
 			{
@@ -978,7 +978,7 @@ class CostbenefitprojectionModelHealth_data extends JModelAdmin
 	protected function _generateNewTitle($title)
 	{
 
-		// [5278] Alter the title
+		// [5279] Alter the title
 		$table = $this->getTable();
 
 		while ($table->load(array('title' => $title)))
diff --git a/admin/models/health_data_sets.php b/admin/models/health_data_sets.php
index 2839b7ef..19156a16 100644
--- a/admin/models/health_data_sets.php
+++ b/admin/models/health_data_sets.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -99,16 +99,16 @@ class CostbenefitprojectionModelHealth_data_sets extends JModelList
 	 */
 	public function getItems()
 	{ 
-		// [10544] check in items
+		// [10545] check in items
 		$this->checkInNow();
 
 		// load parent items
 		$items = parent::getItems();
 
-		// [10619] set values to display correctly.
+		// [10620] set values to display correctly.
 		if (CostbenefitprojectionHelper::checkArray($items))
 		{
-			// [10622] get user object.
+			// [10623] get user object.
 			$user = JFactory::getUser();
 			foreach ($items as $nr => &$item)
 			{
@@ -122,12 +122,12 @@ class CostbenefitprojectionModelHealth_data_sets extends JModelList
 			}
 		} 
 
-		// [10885] set selection value to a translatable value
+		// [10886] set selection value to a translatable value
 		if (CostbenefitprojectionHelper::checkArray($items))
 		{
 			foreach ($items as $nr => &$item)
 			{
-				// [10892] convert year
+				// [10893] convert year
 				$item->year = $this->selectionTranslation($item->year, 'year');
 			}
 		}
@@ -144,7 +144,7 @@ class CostbenefitprojectionModelHealth_data_sets extends JModelList
 	*/
 	public function selectionTranslation($value,$name)
 	{
-		// [10918] Array of year language strings
+		// [10919] Array of year language strings
 		if ($name == 'year')
 		{
 			$yearArray = array(
@@ -165,7 +165,7 @@ class CostbenefitprojectionModelHealth_data_sets extends JModelList
 				2023 => 'COM_COSTBENEFITPROJECTION_HEALTH_DATA_TWO_THOUSAND_AND_TWENTY_THREE',
 				2024 => 'COM_COSTBENEFITPROJECTION_HEALTH_DATA_TWO_THOUSAND_AND_TWENTY_FOUR'
 			);
-			// [10949] Now check if value is found in this array
+			// [10950] Now check if value is found in this array
 			if (isset($yearArray[$value]) && CostbenefitprojectionHelper::checkString($yearArray[$value]))
 			{
 				return $yearArray[$value];
@@ -181,16 +181,16 @@ class CostbenefitprojectionModelHealth_data_sets extends JModelList
 	 */
 	protected function getListQuery()
 	{
-		// [7405] Get the user object.
+		// [7406] Get the user object.
 		$user = JFactory::getUser();
-		// [7407] Create a new query object.
+		// [7408] Create a new query object.
 		$db = JFactory::getDBO();
 		$query = $db->getQuery(true);
 
-		// [7410] Select some fields
+		// [7411] Select some fields
 		$query->select('a.*');
 
-		// [7417] From the costbenefitprojection_item table
+		// [7418] From the costbenefitprojection_item table
 		$query->from($db->quoteName('#__costbenefitprojection_health_data', 'a'));
 
 		// Filter by countries (admin sees all)
@@ -211,15 +211,15 @@ class CostbenefitprojectionModelHealth_data_sets extends JModelList
 			}
 		}
 
-		// [7558] From the costbenefitprojection_causerisk table.
+		// [7559] From the costbenefitprojection_causerisk table.
 		$query->select($db->quoteName('g.name','causerisk_name'));
 		$query->join('LEFT', $db->quoteName('#__costbenefitprojection_causerisk', 'g') . ' ON (' . $db->quoteName('a.causerisk') . ' = ' . $db->quoteName('g.id') . ')');
 
-		// [7558] From the costbenefitprojection_country table.
+		// [7559] From the costbenefitprojection_country table.
 		$query->select($db->quoteName('h.name','country_name'));
 		$query->join('LEFT', $db->quoteName('#__costbenefitprojection_country', 'h') . ' ON (' . $db->quoteName('a.country') . ' = ' . $db->quoteName('h.id') . ')');
 
-		// [7431] Filter by published state
+		// [7432] Filter by published state
 		$published = $this->getState('filter.published');
 		if (is_numeric($published))
 		{
@@ -230,21 +230,21 @@ class CostbenefitprojectionModelHealth_data_sets extends JModelList
 			$query->where('(a.published = 0 OR a.published = 1)');
 		}
 
-		// [7443] Join over the asset groups.
+		// [7444] Join over the asset groups.
 		$query->select('ag.title AS access_level');
 		$query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
-		// [7446] Filter by access level.
+		// [7447] Filter by access level.
 		if ($access = $this->getState('filter.access'))
 		{
 			$query->where('a.access = ' . (int) $access);
 		}
-		// [7451] Implement View Level Access
+		// [7452] Implement View Level Access
 		if (!$user->authorise('core.options', 'com_costbenefitprojection'))
 		{
 			$groups = implode(',', $user->getAuthorisedViewLevels());
 			$query->where('a.access IN (' . $groups . ')');
 		}
-		// [7528] Filter by search.
+		// [7529] Filter by search.
 		$search = $this->getState('filter.search');
 		if (!empty($search))
 		{
@@ -259,23 +259,23 @@ class CostbenefitprojectionModelHealth_data_sets extends JModelList
 			}
 		}
 
-		// [7762] Filter by causerisk.
+		// [7763] Filter by causerisk.
 		if ($causerisk = $this->getState('filter.causerisk'))
 		{
 			$query->where('a.causerisk = ' . $db->quote($db->escape($causerisk, true)));
 		}
-		// [7771] Filter by Year.
+		// [7772] Filter by Year.
 		if ($year = $this->getState('filter.year'))
 		{
 			$query->where('a.year = ' . $db->quote($db->escape($year, true)));
 		}
-		// [7762] Filter by country.
+		// [7763] Filter by country.
 		if ($country = $this->getState('filter.country'))
 		{
 			$query->where('a.country = ' . $db->quote($db->escape($country, true)));
 		}
 
-		// [7487] Add the list ordering clause.
+		// [7488] Add the list ordering clause.
 		$orderCol = $this->state->get('list.ordering', 'a.id');
 		$orderDirn = $this->state->get('list.direction', 'asc');	
 		if ($orderCol != '')
@@ -293,19 +293,19 @@ class CostbenefitprojectionModelHealth_data_sets extends JModelList
 	*/
 	public function getExportData($pks)
 	{
-		// [7195] setup the query
+		// [7196] setup the query
 		if (CostbenefitprojectionHelper::checkArray($pks))
 		{
-			// [7198] Get the user object.
+			// [7199] Get the user object.
 			$user = JFactory::getUser();
-			// [7200] Create a new query object.
+			// [7201] Create a new query object.
 			$db = JFactory::getDBO();
 			$query = $db->getQuery(true);
 
-			// [7203] Select some fields
+			// [7204] Select some fields
 			$query->select('a.*');
 
-			// [7205] From the costbenefitprojection_health_data table
+			// [7206] From the costbenefitprojection_health_data table
 			$query->from($db->quoteName('#__costbenefitprojection_health_data', 'a'));
 			$query->where('a.id IN (' . implode(',',$pks) . ')');
 
@@ -326,27 +326,27 @@ class CostbenefitprojectionModelHealth_data_sets extends JModelList
 				$query->where('a.country = -4');
 			}
 		}
-			// [7215] Implement View Level Access
+			// [7216] Implement View Level Access
 			if (!$user->authorise('core.options', 'com_costbenefitprojection'))
 			{
 				$groups = implode(',', $user->getAuthorisedViewLevels());
 				$query->where('a.access IN (' . $groups . ')');
 			}
 
-			// [7222] Order the results by ordering
+			// [7223] Order the results by ordering
 			$query->order('a.ordering  ASC');
 
-			// [7224] Load the items
+			// [7225] Load the items
 			$db->setQuery($query);
 			$db->execute();
 			if ($db->getNumRows())
 			{
 				$items = $db->loadObjectList();
 
-				// [10619] set values to display correctly.
+				// [10620] set values to display correctly.
 				if (CostbenefitprojectionHelper::checkArray($items))
 				{
-					// [10622] get user object.
+					// [10623] get user object.
 					$user = JFactory::getUser();
 					foreach ($items as $nr => &$item)
 					{
@@ -357,13 +357,13 @@ class CostbenefitprojectionModelHealth_data_sets extends JModelList
 							continue;
 						}
 
-						// [10832] unset the values we don't want exported.
+						// [10833] unset the values we don't want exported.
 						unset($item->asset_id);
 						unset($item->checked_out);
 						unset($item->checked_out_time);
 					}
 				}
-				// [10841] Add headers to items array.
+				// [10842] Add headers to items array.
 				$headers = $this->getExImPortHeaders();
 				if (CostbenefitprojectionHelper::checkObject($headers))
 				{
@@ -382,13 +382,13 @@ class CostbenefitprojectionModelHealth_data_sets extends JModelList
 	*/
 	public function getExImPortHeaders()
 	{
-		// [7244] Get a db connection.
+		// [7245] Get a db connection.
 		$db = JFactory::getDbo();
-		// [7246] get the columns
+		// [7247] get the columns
 		$columns = $db->getTableColumns("#__costbenefitprojection_health_data");
 		if (CostbenefitprojectionHelper::checkArray($columns))
 		{
-			// [7250] remove the headers you don't import/export.
+			// [7251] remove the headers you don't import/export.
 			unset($columns['asset_id']);
 			unset($columns['checked_out']);
 			unset($columns['checked_out_time']);
@@ -410,7 +410,7 @@ class CostbenefitprojectionModelHealth_data_sets extends JModelList
 	 */
 	protected function getStoreId($id = '')
 	{
-		// [10167] Compile the store id.
+		// [10168] Compile the store id.
 		$id .= ':' . $this->getState('filter.id');
 		$id .= ':' . $this->getState('filter.search');
 		$id .= ':' . $this->getState('filter.published');
@@ -432,15 +432,15 @@ class CostbenefitprojectionModelHealth_data_sets extends JModelList
 	*/
 	protected function checkInNow()
 	{
-		// [10560] Get set check in time
+		// [10561] Get set check in time
 		$time = JComponentHelper::getParams('com_costbenefitprojection')->get('check_in');
 		
 		if ($time)
 		{
 
-			// [10565] Get a db connection.
+			// [10566] Get a db connection.
 			$db = JFactory::getDbo();
-			// [10567] reset query
+			// [10568] reset query
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__costbenefitprojection_health_data'));
@@ -448,24 +448,24 @@ class CostbenefitprojectionModelHealth_data_sets extends JModelList
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// [10575] Get Yesterdays date
+				// [10576] Get Yesterdays date
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// [10577] reset query
+				// [10578] reset query
 				$query = $db->getQuery(true);
 
-				// [10579] Fields to update.
+				// [10580] Fields to update.
 				$fields = array(
 					$db->quoteName('checked_out_time') . '=\'0000-00-00 00:00:00\'',
 					$db->quoteName('checked_out') . '=0'
 				);
 
-				// [10584] Conditions for which records should be updated.
+				// [10585] Conditions for which records should be updated.
 				$conditions = array(
 					$db->quoteName('checked_out') . '!=0', 
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);
 
-				// [10589] Check table
+				// [10590] Check table
 				$query->update($db->quoteName('#__costbenefitprojection_health_data'))->set($fields)->where($conditions); 
 
 				$db->setQuery($query);
diff --git a/admin/models/help_document.php b/admin/models/help_document.php
index 2d827597..bcd30994 100644
--- a/admin/models/help_document.php
+++ b/admin/models/help_document.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -91,7 +91,7 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
 
 			if (!empty($item->groups))
 			{
-				// [4004] JSON Decode groups.
+				// [4005] JSON Decode groups.
 				$item->groups = json_decode($item->groups,true);
 			}
 			
@@ -116,7 +116,7 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
 	 * @since   1.6
 	 */
 	public function getForm($data = array(), $loadData = true)
-	{		// [9574] Get the form.
+	{		// [9575] Get the form.
 		$form = $this->loadForm('com_costbenefitprojection.help_document', 'help_document', array('control' => 'jform', 'load_data' => $loadData));
 
 		if (empty($form))
@@ -126,12 +126,12 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
 
 		$jinput = JFactory::getApplication()->input;
 
-		// [9659] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first.
+		// [9660] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first.
 		if ($jinput->get('a_id'))
 		{
 			$id = $jinput->get('a_id', 0, 'INT');
 		}
-		// [9664] The back end uses id so we use that the rest of the time and set it to 0 by default.
+		// [9665] The back end uses id so we use that the rest of the time and set it to 0 by default.
 		else
 		{
 			$id = $jinput->get('id', 0, 'INT');
@@ -139,34 +139,34 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
 
 		$user = JFactory::getUser();
 
-		// [9670] Check for existing item.
-		// [9671] Modify the form based on Edit State access controls.
+		// [9671] Check for existing item.
+		// [9672] Modify the form based on Edit State access controls.
 		if ($id != 0 && (!$user->authorise('help_document.edit.state', 'com_costbenefitprojection.help_document.' . (int) $id))
 			|| ($id == 0 && !$user->authorise('help_document.edit.state', 'com_costbenefitprojection')))
 		{
-			// [9684] Disable fields for display.
+			// [9685] Disable fields for display.
 			$form->setFieldAttribute('ordering', 'disabled', 'true');
 			$form->setFieldAttribute('published', 'disabled', 'true');
-			// [9687] Disable fields while saving.
+			// [9688] Disable fields while saving.
 			$form->setFieldAttribute('ordering', 'filter', 'unset');
 			$form->setFieldAttribute('published', 'filter', 'unset');
 		}
-		// [9692] Modify the form based on Edit Creaded By access controls.
+		// [9693] Modify the form based on Edit Creaded By access controls.
 		if (!$user->authorise('core.edit.created_by', 'com_costbenefitprojection'))
 		{
-			// [9704] Disable fields for display.
+			// [9705] Disable fields for display.
 			$form->setFieldAttribute('created_by', 'disabled', 'true');
-			// [9706] Disable fields for display.
+			// [9707] Disable fields for display.
 			$form->setFieldAttribute('created_by', 'readonly', 'true');
-			// [9708] Disable fields while saving.
+			// [9709] Disable fields while saving.
 			$form->setFieldAttribute('created_by', 'filter', 'unset');
 		}
-		// [9711] Modify the form based on Edit Creaded Date access controls.
+		// [9712] Modify the form based on Edit Creaded Date access controls.
 		if (!$user->authorise('core.edit.created', 'com_costbenefitprojection'))
 		{
-			// [9723] Disable fields for display.
+			// [9724] Disable fields for display.
 			$form->setFieldAttribute('created', 'disabled', 'true');
-			// [9725] Disable fields while saving.
+			// [9726] Disable fields while saving.
 			$form->setFieldAttribute('created', 'filter', 'unset');
 		}
 
@@ -202,7 +202,7 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
 			}
 
 			$user = JFactory::getUser();
-			// [9875] The record has been set. Check the record permissions.
+			// [9876] The record has been set. Check the record permissions.
 			return $user->authorise('help_document.delete', 'com_costbenefitprojection.help_document.' . (int) $record->id);
 		}
 		return false;
@@ -224,14 +224,14 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
 
 		if ($recordId)
 		{
-			// [9962] The record has been set. Check the record permissions.
+			// [9963] The record has been set. Check the record permissions.
 			$permission = $user->authorise('help_document.edit.state', 'com_costbenefitprojection.help_document.' . (int) $recordId);
 			if (!$permission && !is_null($permission))
 			{
 				return false;
 			}
 		}
-		// [9979] In the absense of better information, revert to the component permissions.
+		// [9980] In the absense of better information, revert to the component permissions.
 		return $user->authorise('help_document.edit.state', 'com_costbenefitprojection');
 	}
     
@@ -246,7 +246,7 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
 	 */
 	protected function allowEdit($data = array(), $key = 'id')
 	{
-		// [9787] Check specific edit permission then general edit permission.
+		// [9788] Check specific edit permission then general edit permission.
 		$user = JFactory::getUser();
 
 		return $user->authorise('help_document.edit', 'com_costbenefitprojection.help_document.'. ((int) isset($data[$key]) ? $data[$key] : 0)) or $user->authorise('help_document.edit',  'com_costbenefitprojection');
@@ -345,20 +345,20 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
 	*/
 	public function validate($form, $data, $group = null)
 	{
-		// [8778] check if the not_required field is set
+		// [8779] check if the not_required field is set
 		if (CostbenefitprojectionHelper::checkString($data['not_required']))
 		{
 			$requiredFields = (array) explode(',',(string) $data['not_required']);
 			$requiredFields = array_unique($requiredFields);
-			// [8783] now change the required field attributes value
+			// [8784] now change the required field attributes value
 			foreach ($requiredFields as $requiredField)
 			{
-				// [8786] make sure there is a string value
+				// [8787] make sure there is a string value
 				if (CostbenefitprojectionHelper::checkString($requiredField))
 				{
-					// [8789] change to false
+					// [8790] change to false
 					$form->setFieldAttribute($requiredField, 'required', 'false');
-					// [8791] also clear the data set
+					// [8792] also clear the data set
 					$data[$requiredField] = '';
 				}
 			}
@@ -489,7 +489,7 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
 	{
 		if (empty($this->batchSet))
 		{
-			// [4940] Set some needed variables.
+			// [4941] Set some needed variables.
 			$this->user 		= JFactory::getUser();
 			$this->table 		= $this->getTable();
 			$this->tableClassName	= get_class($this->table);
@@ -503,12 +503,12 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
 			return false;
 		}
 
-		// [4960] get list of uniqe fields
+		// [4961] get list of uniqe fields
 		$uniqeFields = $this->getUniqeFields();
-		// [4962] remove move_copy from array
+		// [4963] remove move_copy from array
 		unset($values['move_copy']);
 
-		// [4965] make sure published is set
+		// [4966] make sure published is set
 		if (!isset($values['published']))
 		{
 			$values['published'] = 0;
@@ -520,21 +520,21 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
 
 		$newIds = array();
 
-		// [5002] Parent exists so let's proceed
+		// [5003] Parent exists so let's proceed
 		while (!empty($pks))
 		{
-			// [5005] Pop the first ID off the stack
+			// [5006] Pop the first ID off the stack
 			$pk = array_shift($pks);
 
 			$this->table->reset();
 
-			// [5010] only allow copy if user may edit this item.
+			// [5011] only allow copy if user may edit this item.
 
 			if (!$this->user->authorise('help_document.edit', $contexts[$pk]))
 
 			{
 
-				// [5020] Not fatal error
+				// [5021] Not fatal error
 
 				$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 
@@ -542,19 +542,19 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
 
 			}
 
-			// [5025] Check that the row actually exists
+			// [5026] Check that the row actually exists
 			if (!$this->table->load($pk))
 			{
 				if ($error = $this->table->getError())
 				{
-					// [5030] Fatal error
+					// [5031] Fatal error
 					$this->setError($error);
 
 					return false;
 				}
 				else
 				{
-					// [5037] Not fatal error
+					// [5038] Not fatal error
 					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 					continue;
 				}
@@ -562,7 +562,7 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
 
 			list($this->table->title, $this->table->alias) = $this->_generateNewTitle($this->table->alias, $this->table->title);
 
-			// [5073] insert all set values
+			// [5074] insert all set values
 			if (CostbenefitprojectionHelper::checkArray($values))
 			{
 				foreach ($values as $key => $value)
@@ -574,7 +574,7 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
 				}
 			}
 
-			// [5085] update all uniqe fields
+			// [5086] update all uniqe fields
 			if (CostbenefitprojectionHelper::checkArray($uniqeFields))
 			{
 				foreach ($uniqeFields as $uniqeField)
@@ -583,13 +583,13 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
 				}
 			}
 
-			// [5094] Reset the ID because we are making a copy
+			// [5095] Reset the ID because we are making a copy
 			$this->table->id = 0;
 
-			// [5097] TODO: Deal with ordering?
-			// [5098] $this->table->ordering	= 1;
+			// [5098] TODO: Deal with ordering?
+			// [5099] $this->table->ordering	= 1;
 
-			// [5100] Check the row.
+			// [5101] Check the row.
 			if (!$this->table->check())
 			{
 				$this->setError($this->table->getError());
@@ -602,7 +602,7 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
 				$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
 			}
 
-			// [5113] Store the row.
+			// [5114] Store the row.
 			if (!$this->table->store())
 			{
 				$this->setError($this->table->getError());
@@ -610,14 +610,14 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
 				return false;
 			}
 
-			// [5121] Get the new item ID
+			// [5122] Get the new item ID
 			$newId = $this->table->get('id');
 
-			// [5124] Add the new ID to the array
+			// [5125] Add the new ID to the array
 			$newIds[$pk] = $newId;
 		}
 
-		// [5128] Clean the cache
+		// [5129] Clean the cache
 		$this->cleanCache();
 
 		return $newIds;
@@ -638,7 +638,7 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
 	{
 		if (empty($this->batchSet))
 		{
-			// [4742] Set some needed variables.
+			// [4743] Set some needed variables.
 			$this->user		= JFactory::getUser();
 			$this->table		= $this->getTable();
 			$this->tableClassName	= get_class($this->table);
@@ -653,15 +653,15 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
 			return false;
 		}
 
-		// [4764] make sure published only updates if user has the permission.
+		// [4765] make sure published only updates if user has the permission.
 		if (isset($values['published']) && !$this->canDo->get('help_document.edit.state'))
 		{
 			unset($values['published']);
 		}
-		// [4777] remove move_copy from array
+		// [4778] remove move_copy from array
 		unset($values['move_copy']);
 
-		// [4798] Parent exists so we proceed
+		// [4799] Parent exists so we proceed
 		foreach ($pks as $pk)
 		{
 			if (!$this->user->authorise('help_document.edit', $contexts[$pk]))
@@ -671,30 +671,30 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
 				return false;
 			}
 
-			// [4815] Check that the row actually exists
+			// [4816] Check that the row actually exists
 			if (!$this->table->load($pk))
 			{
 				if ($error = $this->table->getError())
 				{
-					// [4820] Fatal error
+					// [4821] Fatal error
 					$this->setError($error);
 
 					return false;
 				}
 				else
 				{
-					// [4827] Not fatal error
+					// [4828] Not fatal error
 					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 					continue;
 				}
 			}
 
-			// [4833] insert all set values.
+			// [4834] insert all set values.
 			if (CostbenefitprojectionHelper::checkArray($values))
 			{
 				foreach ($values as $key => $value)
 				{
-					// [4838] Do special action for access.
+					// [4839] Do special action for access.
 					if ('access' == $key && strlen($value) > 0)
 					{
 						$this->table->$key = $value;
@@ -707,7 +707,7 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
 			}
 
 
-			// [4850] Check the row.
+			// [4851] Check the row.
 			if (!$this->table->check())
 			{
 				$this->setError($this->table->getError());
@@ -720,7 +720,7 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
 				$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
 			}
 
-			// [4863] Store the row.
+			// [4864] Store the row.
 			if (!$this->table->store())
 			{
 				$this->setError($this->table->getError());
@@ -729,7 +729,7 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
 			}
 		}
 
-		// [4872] Clean the cache
+		// [4873] Clean the cache
 		$this->cleanCache();
 
 		return true;
@@ -759,7 +759,7 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
 			$data['metadata'] = (string) $metadata;
 		} 
 
-		// [4114] Set the groups string to JSON string.
+		// [4115] Set the groups string to JSON string.
 		if (isset($data['groups']))
 		{
 			$data['groups'] = (string) json_encode($data['groups']);
@@ -773,7 +773,7 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
 			$data['params'] = (string) $params;
 		}
 
-		// [5154] Alter the title for save as copy
+		// [5155] Alter the title for save as copy
 		if ($input->get('task') == 'save2copy')
 		{
 			$origTable = clone $this->getTable();
@@ -796,7 +796,7 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
 			$data['published'] = 0;
 		}
 
-		// [5181] Automatic handling of alias for empty fields
+		// [5182] Automatic handling of alias for empty fields
 		if (in_array($input->get('task'), array('apply', 'save', 'save2new')) && (int) $input->get('id') == 0)
 		{
 			if ($data['alias'] == null)
@@ -827,10 +827,10 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
 			}
 		}
 
-		// [5220] Alter the uniqe field for save as copy
+		// [5221] Alter the uniqe field for save as copy
 		if ($input->get('task') == 'save2copy')
 		{
-			// [5223] Automatic handling of other uniqe fields
+			// [5224] Automatic handling of other uniqe fields
 			$uniqeFields = $this->getUniqeFields();
 			if (CostbenefitprojectionHelper::checkArray($uniqeFields))
 			{
@@ -884,7 +884,7 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
 	protected function _generateNewTitle($alias, $title)
 	{
 
-		// [5254] Alter the title & alias
+		// [5255] Alter the title & alias
 		$table = $this->getTable();
 
 		while ($table->load(array('alias' => $alias)))
diff --git a/admin/models/help_documents.php b/admin/models/help_documents.php
index 2ffd1906..0ce5f219 100644
--- a/admin/models/help_documents.php
+++ b/admin/models/help_documents.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -107,16 +107,16 @@ class CostbenefitprojectionModelHelp_documents extends JModelList
 	 */
 	public function getItems()
 	{ 
-		// [10544] check in items
+		// [10545] check in items
 		$this->checkInNow();
 
 		// load parent items
 		$items = parent::getItems();
 
-		// [10619] set values to display correctly.
+		// [10620] set values to display correctly.
 		if (CostbenefitprojectionHelper::checkArray($items))
 		{
-			// [10622] get user object.
+			// [10623] get user object.
 			$user = JFactory::getUser();
 			foreach ($items as $nr => &$item)
 			{
@@ -127,7 +127,7 @@ class CostbenefitprojectionModelHelp_documents extends JModelList
 					continue;
 				}
 
-				// [10690] decode groups
+				// [10691] decode groups
 				$groupsArray = json_decode($item->groups, true);
 				if (CostbenefitprojectionHelper::checkArray($groupsArray))
 				{
@@ -150,14 +150,14 @@ class CostbenefitprojectionModelHelp_documents extends JModelList
 			}
 		} 
 
-		// [10885] set selection value to a translatable value
+		// [10886] set selection value to a translatable value
 		if (CostbenefitprojectionHelper::checkArray($items))
 		{
 			foreach ($items as $nr => &$item)
 			{
-				// [10892] convert type
+				// [10893] convert type
 				$item->type = $this->selectionTranslation($item->type, 'type');
-				// [10892] convert location
+				// [10893] convert location
 				$item->location = $this->selectionTranslation($item->location, 'location');
 			}
 		}
@@ -174,7 +174,7 @@ class CostbenefitprojectionModelHelp_documents extends JModelList
 	*/
 	public function selectionTranslation($value,$name)
 	{
-		// [10918] Array of type language strings
+		// [10919] Array of type language strings
 		if ($name == 'type')
 		{
 			$typeArray = array(
@@ -183,20 +183,20 @@ class CostbenefitprojectionModelHelp_documents extends JModelList
 				2 => 'COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_TEXT',
 				3 => 'COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_URL'
 			);
-			// [10949] Now check if value is found in this array
+			// [10950] Now check if value is found in this array
 			if (isset($typeArray[$value]) && CostbenefitprojectionHelper::checkString($typeArray[$value]))
 			{
 				return $typeArray[$value];
 			}
 		}
-		// [10918] Array of location language strings
+		// [10919] Array of location language strings
 		if ($name == 'location')
 		{
 			$locationArray = array(
 				1 => 'COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_ADMIN',
 				2 => 'COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_SITE'
 			);
-			// [10949] Now check if value is found in this array
+			// [10950] Now check if value is found in this array
 			if (isset($locationArray[$value]) && CostbenefitprojectionHelper::checkString($locationArray[$value]))
 			{
 				return $locationArray[$value];
@@ -212,19 +212,19 @@ class CostbenefitprojectionModelHelp_documents extends JModelList
 	 */
 	protected function getListQuery()
 	{
-		// [7405] Get the user object.
+		// [7406] Get the user object.
 		$user = JFactory::getUser();
-		// [7407] Create a new query object.
+		// [7408] Create a new query object.
 		$db = JFactory::getDBO();
 		$query = $db->getQuery(true);
 
-		// [7410] Select some fields
+		// [7411] Select some fields
 		$query->select('a.*');
 
-		// [7417] From the costbenefitprojection_item table
+		// [7418] From the costbenefitprojection_item table
 		$query->from($db->quoteName('#__costbenefitprojection_help_document', 'a'));
 
-		// [7431] Filter by published state
+		// [7432] Filter by published state
 		$published = $this->getState('filter.published');
 		if (is_numeric($published))
 		{
@@ -234,7 +234,7 @@ class CostbenefitprojectionModelHelp_documents extends JModelList
 		{
 			$query->where('(a.published = 0 OR a.published = 1)');
 		}
-		// [7528] Filter by search.
+		// [7529] Filter by search.
 		$search = $this->getState('filter.search');
 		if (!empty($search))
 		{
@@ -249,28 +249,28 @@ class CostbenefitprojectionModelHelp_documents extends JModelList
 			}
 		}
 
-		// [7771] Filter by Type.
+		// [7772] Filter by Type.
 		if ($type = $this->getState('filter.type'))
 		{
 			$query->where('a.type = ' . $db->quote($db->escape($type, true)));
 		}
-		// [7771] Filter by Location.
+		// [7772] Filter by Location.
 		if ($location = $this->getState('filter.location'))
 		{
 			$query->where('a.location = ' . $db->quote($db->escape($location, true)));
 		}
-		// [7771] Filter by Admin_view.
+		// [7772] Filter by Admin_view.
 		if ($admin_view = $this->getState('filter.admin_view'))
 		{
 			$query->where('a.admin_view = ' . $db->quote($db->escape($admin_view, true)));
 		}
-		// [7771] Filter by Site_view.
+		// [7772] Filter by Site_view.
 		if ($site_view = $this->getState('filter.site_view'))
 		{
 			$query->where('a.site_view = ' . $db->quote($db->escape($site_view, true)));
 		}
 
-		// [7487] Add the list ordering clause.
+		// [7488] Add the list ordering clause.
 		$orderCol = $this->state->get('list.ordering', 'a.id');
 		$orderDirn = $this->state->get('list.direction', 'asc');	
 		if ($orderCol != '')
@@ -288,36 +288,36 @@ class CostbenefitprojectionModelHelp_documents extends JModelList
 	*/
 	public function getExportData($pks)
 	{
-		// [7195] setup the query
+		// [7196] setup the query
 		if (CostbenefitprojectionHelper::checkArray($pks))
 		{
-			// [7198] Get the user object.
+			// [7199] Get the user object.
 			$user = JFactory::getUser();
-			// [7200] Create a new query object.
+			// [7201] Create a new query object.
 			$db = JFactory::getDBO();
 			$query = $db->getQuery(true);
 
-			// [7203] Select some fields
+			// [7204] Select some fields
 			$query->select('a.*');
 
-			// [7205] From the costbenefitprojection_help_document table
+			// [7206] From the costbenefitprojection_help_document table
 			$query->from($db->quoteName('#__costbenefitprojection_help_document', 'a'));
 			$query->where('a.id IN (' . implode(',',$pks) . ')');
 
-			// [7222] Order the results by ordering
+			// [7223] Order the results by ordering
 			$query->order('a.ordering  ASC');
 
-			// [7224] Load the items
+			// [7225] Load the items
 			$db->setQuery($query);
 			$db->execute();
 			if ($db->getNumRows())
 			{
 				$items = $db->loadObjectList();
 
-				// [10619] set values to display correctly.
+				// [10620] set values to display correctly.
 				if (CostbenefitprojectionHelper::checkArray($items))
 				{
-					// [10622] get user object.
+					// [10623] get user object.
 					$user = JFactory::getUser();
 					foreach ($items as $nr => &$item)
 					{
@@ -328,13 +328,13 @@ class CostbenefitprojectionModelHelp_documents extends JModelList
 							continue;
 						}
 
-						// [10832] unset the values we don't want exported.
+						// [10833] unset the values we don't want exported.
 						unset($item->asset_id);
 						unset($item->checked_out);
 						unset($item->checked_out_time);
 					}
 				}
-				// [10841] Add headers to items array.
+				// [10842] Add headers to items array.
 				$headers = $this->getExImPortHeaders();
 				if (CostbenefitprojectionHelper::checkObject($headers))
 				{
@@ -353,13 +353,13 @@ class CostbenefitprojectionModelHelp_documents extends JModelList
 	*/
 	public function getExImPortHeaders()
 	{
-		// [7244] Get a db connection.
+		// [7245] Get a db connection.
 		$db = JFactory::getDbo();
-		// [7246] get the columns
+		// [7247] get the columns
 		$columns = $db->getTableColumns("#__costbenefitprojection_help_document");
 		if (CostbenefitprojectionHelper::checkArray($columns))
 		{
-			// [7250] remove the headers you don't import/export.
+			// [7251] remove the headers you don't import/export.
 			unset($columns['asset_id']);
 			unset($columns['checked_out']);
 			unset($columns['checked_out_time']);
@@ -381,7 +381,7 @@ class CostbenefitprojectionModelHelp_documents extends JModelList
 	 */
 	protected function getStoreId($id = '')
 	{
-		// [10167] Compile the store id.
+		// [10168] Compile the store id.
 		$id .= ':' . $this->getState('filter.id');
 		$id .= ':' . $this->getState('filter.search');
 		$id .= ':' . $this->getState('filter.published');
@@ -405,15 +405,15 @@ class CostbenefitprojectionModelHelp_documents extends JModelList
 	*/
 	protected function checkInNow()
 	{
-		// [10560] Get set check in time
+		// [10561] Get set check in time
 		$time = JComponentHelper::getParams('com_costbenefitprojection')->get('check_in');
 		
 		if ($time)
 		{
 
-			// [10565] Get a db connection.
+			// [10566] Get a db connection.
 			$db = JFactory::getDbo();
-			// [10567] reset query
+			// [10568] reset query
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__costbenefitprojection_help_document'));
@@ -421,24 +421,24 @@ class CostbenefitprojectionModelHelp_documents extends JModelList
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// [10575] Get Yesterdays date
+				// [10576] Get Yesterdays date
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// [10577] reset query
+				// [10578] reset query
 				$query = $db->getQuery(true);
 
-				// [10579] Fields to update.
+				// [10580] Fields to update.
 				$fields = array(
 					$db->quoteName('checked_out_time') . '=\'0000-00-00 00:00:00\'',
 					$db->quoteName('checked_out') . '=0'
 				);
 
-				// [10584] Conditions for which records should be updated.
+				// [10585] Conditions for which records should be updated.
 				$conditions = array(
 					$db->quoteName('checked_out') . '!=0', 
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);
 
-				// [10589] Check table
+				// [10590] Check table
 				$query->update($db->quoteName('#__costbenefitprojection_help_document'))->set($fields)->where($conditions); 
 
 				$db->setQuery($query);
diff --git a/admin/models/import.php b/admin/models/import.php
index 39fd3131..8a9d1381 100644
--- a/admin/models/import.php
+++ b/admin/models/import.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/models/intervention.php b/admin/models/intervention.php
index 47663373..b938d1b8 100644
--- a/admin/models/intervention.php
+++ b/admin/models/intervention.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -91,7 +91,7 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 
 			if (!empty($item->interventions))
 			{
-				// [4004] JSON Decode interventions.
+				// [4005] JSON Decode interventions.
 				$item->interventions = json_decode($item->interventions);
 			}
 			
@@ -116,7 +116,7 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 	 * @since   1.6
 	 */
 	public function getForm($data = array(), $loadData = true)
-	{		// [9574] Get the form.
+	{		// [9575] Get the form.
 		$form = $this->loadForm('com_costbenefitprojection.intervention', 'intervention', array('control' => 'jform', 'load_data' => $loadData));
 
 		if (empty($form))
@@ -126,12 +126,12 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 
 		$jinput = JFactory::getApplication()->input;
 
-		// [9659] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first.
+		// [9660] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first.
 		if ($jinput->get('a_id'))
 		{
 			$id = $jinput->get('a_id', 0, 'INT');
 		}
-		// [9664] The back end uses id so we use that the rest of the time and set it to 0 by default.
+		// [9665] The back end uses id so we use that the rest of the time and set it to 0 by default.
 		else
 		{
 			$id = $jinput->get('id', 0, 'INT');
@@ -139,34 +139,34 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 
 		$user = JFactory::getUser();
 
-		// [9670] Check for existing item.
-		// [9671] Modify the form based on Edit State access controls.
+		// [9671] Check for existing item.
+		// [9672] Modify the form based on Edit State access controls.
 		if ($id != 0 && (!$user->authorise('intervention.edit.state', 'com_costbenefitprojection.intervention.' . (int) $id))
 			|| ($id == 0 && !$user->authorise('intervention.edit.state', 'com_costbenefitprojection')))
 		{
-			// [9684] Disable fields for display.
+			// [9685] Disable fields for display.
 			$form->setFieldAttribute('ordering', 'disabled', 'true');
 			$form->setFieldAttribute('published', 'disabled', 'true');
-			// [9687] Disable fields while saving.
+			// [9688] Disable fields while saving.
 			$form->setFieldAttribute('ordering', 'filter', 'unset');
 			$form->setFieldAttribute('published', 'filter', 'unset');
 		}
-		// [9692] Modify the form based on Edit Creaded By access controls.
+		// [9693] Modify the form based on Edit Creaded By access controls.
 		if (!$user->authorise('core.edit.created_by', 'com_costbenefitprojection'))
 		{
-			// [9704] Disable fields for display.
+			// [9705] Disable fields for display.
 			$form->setFieldAttribute('created_by', 'disabled', 'true');
-			// [9706] Disable fields for display.
+			// [9707] Disable fields for display.
 			$form->setFieldAttribute('created_by', 'readonly', 'true');
-			// [9708] Disable fields while saving.
+			// [9709] Disable fields while saving.
 			$form->setFieldAttribute('created_by', 'filter', 'unset');
 		}
-		// [9711] Modify the form based on Edit Creaded Date access controls.
+		// [9712] Modify the form based on Edit Creaded Date access controls.
 		if (!$user->authorise('core.edit.created', 'com_costbenefitprojection'))
 		{
-			// [9723] Disable fields for display.
+			// [9724] Disable fields for display.
 			$form->setFieldAttribute('created', 'disabled', 'true');
-			// [9725] Disable fields while saving.
+			// [9726] Disable fields while saving.
 			$form->setFieldAttribute('created', 'filter', 'unset');
 		}
 
@@ -202,7 +202,7 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 			}
 
 			$user = JFactory::getUser();
-			// [9875] The record has been set. Check the record permissions.
+			// [9876] The record has been set. Check the record permissions.
 			return $user->authorise('intervention.delete', 'com_costbenefitprojection.intervention.' . (int) $record->id);
 		}
 		return false;
@@ -224,14 +224,14 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 
 		if ($recordId)
 		{
-			// [9962] The record has been set. Check the record permissions.
+			// [9963] The record has been set. Check the record permissions.
 			$permission = $user->authorise('intervention.edit.state', 'com_costbenefitprojection.intervention.' . (int) $recordId);
 			if (!$permission && !is_null($permission))
 			{
 				return false;
 			}
 		}
-		// [9979] In the absense of better information, revert to the component permissions.
+		// [9980] In the absense of better information, revert to the component permissions.
 		return $user->authorise('intervention.edit.state', 'com_costbenefitprojection');
 	}
     
@@ -246,7 +246,7 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 	 */
 	protected function allowEdit($data = array(), $key = 'id')
 	{
-		// [9787] Check specific edit permission then general edit permission.
+		// [9788] Check specific edit permission then general edit permission.
 		$user = JFactory::getUser();
 		$recordId	= (int) isset($data[$key]) ? $data[$key] : 0;
 		// get company id
@@ -361,20 +361,20 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 	*/
 	public function validate($form, $data, $group = null)
 	{
-		// [8778] check if the not_required field is set
+		// [8779] check if the not_required field is set
 		if (CostbenefitprojectionHelper::checkString($data['not_required']))
 		{
 			$requiredFields = (array) explode(',',(string) $data['not_required']);
 			$requiredFields = array_unique($requiredFields);
-			// [8783] now change the required field attributes value
+			// [8784] now change the required field attributes value
 			foreach ($requiredFields as $requiredField)
 			{
-				// [8786] make sure there is a string value
+				// [8787] make sure there is a string value
 				if (CostbenefitprojectionHelper::checkString($requiredField))
 				{
-					// [8789] change to false
+					// [8790] change to false
 					$form->setFieldAttribute($requiredField, 'required', 'false');
-					// [8791] also clear the data set
+					// [8792] also clear the data set
 					$data[$requiredField] = '';
 				}
 			}
@@ -505,7 +505,7 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 	{
 		if (empty($this->batchSet))
 		{
-			// [4940] Set some needed variables.
+			// [4941] Set some needed variables.
 			$this->user 		= JFactory::getUser();
 			$this->table 		= $this->getTable();
 			$this->tableClassName	= get_class($this->table);
@@ -563,12 +563,12 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 			}
 		}
 
-		// [4960] get list of uniqe fields
+		// [4961] get list of uniqe fields
 		$uniqeFields = $this->getUniqeFields();
-		// [4962] remove move_copy from array
+		// [4963] remove move_copy from array
 		unset($values['move_copy']);
 
-		// [4965] make sure published is set
+		// [4966] make sure published is set
 		if (!isset($values['published']))
 		{
 			$values['published'] = 0;
@@ -580,21 +580,21 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 
 		$newIds = array();
 
-		// [5002] Parent exists so let's proceed
+		// [5003] Parent exists so let's proceed
 		while (!empty($pks))
 		{
-			// [5005] Pop the first ID off the stack
+			// [5006] Pop the first ID off the stack
 			$pk = array_shift($pks);
 
 			$this->table->reset();
 
-			// [5010] only allow copy if user may edit this item.
+			// [5011] only allow copy if user may edit this item.
 
 			if (!$this->user->authorise('intervention.edit', $contexts[$pk]))
 
 			{
 
-				// [5020] Not fatal error
+				// [5021] Not fatal error
 
 				$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 
@@ -602,19 +602,19 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 
 			}
 
-			// [5025] Check that the row actually exists
+			// [5026] Check that the row actually exists
 			if (!$this->table->load($pk))
 			{
 				if ($error = $this->table->getError())
 				{
-					// [5030] Fatal error
+					// [5031] Fatal error
 					$this->setError($error);
 
 					return false;
 				}
 				else
 				{
-					// [5037] Not fatal error
+					// [5038] Not fatal error
 					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 					continue;
 				}
@@ -622,7 +622,7 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 
 			$this->table->name = $this->generateUniqe('name',$this->table->name);
 
-			// [5073] insert all set values
+			// [5074] insert all set values
 			if (CostbenefitprojectionHelper::checkArray($values))
 			{
 				foreach ($values as $key => $value)
@@ -634,7 +634,7 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 				}
 			}
 
-			// [5085] update all uniqe fields
+			// [5086] update all uniqe fields
 			if (CostbenefitprojectionHelper::checkArray($uniqeFields))
 			{
 				foreach ($uniqeFields as $uniqeField)
@@ -643,13 +643,13 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 				}
 			}
 
-			// [5094] Reset the ID because we are making a copy
+			// [5095] Reset the ID because we are making a copy
 			$this->table->id = 0;
 
-			// [5097] TODO: Deal with ordering?
-			// [5098] $this->table->ordering	= 1;
+			// [5098] TODO: Deal with ordering?
+			// [5099] $this->table->ordering	= 1;
 
-			// [5100] Check the row.
+			// [5101] Check the row.
 			if (!$this->table->check())
 			{
 				$this->setError($this->table->getError());
@@ -662,7 +662,7 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 				$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
 			}
 
-			// [5113] Store the row.
+			// [5114] Store the row.
 			if (!$this->table->store())
 			{
 				$this->setError($this->table->getError());
@@ -670,14 +670,14 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 				return false;
 			}
 
-			// [5121] Get the new item ID
+			// [5122] Get the new item ID
 			$newId = $this->table->get('id');
 
-			// [5124] Add the new ID to the array
+			// [5125] Add the new ID to the array
 			$newIds[$pk] = $newId;
 		}
 
-		// [5128] Clean the cache
+		// [5129] Clean the cache
 		$this->cleanCache();
 
 		return $newIds;
@@ -698,7 +698,7 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 	{
 		if (empty($this->batchSet))
 		{
-			// [4742] Set some needed variables.
+			// [4743] Set some needed variables.
 			$this->user		= JFactory::getUser();
 			$this->table		= $this->getTable();
 			$this->tableClassName	= get_class($this->table);
@@ -757,15 +757,15 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 			}
 		}
 
-		// [4764] make sure published only updates if user has the permission.
+		// [4765] make sure published only updates if user has the permission.
 		if (isset($values['published']) && !$this->canDo->get('intervention.edit.state'))
 		{
 			unset($values['published']);
 		}
-		// [4777] remove move_copy from array
+		// [4778] remove move_copy from array
 		unset($values['move_copy']);
 
-		// [4798] Parent exists so we proceed
+		// [4799] Parent exists so we proceed
 		foreach ($pks as $pk)
 		{
 			if (!$this->user->authorise('intervention.edit', $contexts[$pk]))
@@ -775,30 +775,30 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 				return false;
 			}
 
-			// [4815] Check that the row actually exists
+			// [4816] Check that the row actually exists
 			if (!$this->table->load($pk))
 			{
 				if ($error = $this->table->getError())
 				{
-					// [4820] Fatal error
+					// [4821] Fatal error
 					$this->setError($error);
 
 					return false;
 				}
 				else
 				{
-					// [4827] Not fatal error
+					// [4828] Not fatal error
 					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 					continue;
 				}
 			}
 
-			// [4833] insert all set values.
+			// [4834] insert all set values.
 			if (CostbenefitprojectionHelper::checkArray($values))
 			{
 				foreach ($values as $key => $value)
 				{
-					// [4838] Do special action for access.
+					// [4839] Do special action for access.
 					if ('access' == $key && strlen($value) > 0)
 					{
 						$this->table->$key = $value;
@@ -811,7 +811,7 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 			}
 
 
-			// [4850] Check the row.
+			// [4851] Check the row.
 			if (!$this->table->check())
 			{
 				$this->setError($this->table->getError());
@@ -824,7 +824,7 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 				$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
 			}
 
-			// [4863] Store the row.
+			// [4864] Store the row.
 			if (!$this->table->store())
 			{
 				$this->setError($this->table->getError());
@@ -833,7 +833,7 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 			}
 		}
 
-		// [4872] Clean the cache
+		// [4873] Clean the cache
 		$this->cleanCache();
 
 		return true;
@@ -863,7 +863,7 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 			$data['metadata'] = (string) $metadata;
 		} 
 
-		// [4114] Set the interventions string to JSON string.
+		// [4115] Set the interventions string to JSON string.
 		if (isset($data['interventions']))
 		{
 			$data['interventions'] = (string) json_encode($data['interventions']);
@@ -877,10 +877,10 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 			$data['params'] = (string) $params;
 		}
 
-		// [5220] Alter the uniqe field for save as copy
+		// [5221] Alter the uniqe field for save as copy
 		if ($input->get('task') == 'save2copy')
 		{
-			// [5223] Automatic handling of other uniqe fields
+			// [5224] Automatic handling of other uniqe fields
 			$uniqeFields = $this->getUniqeFields();
 			if (CostbenefitprojectionHelper::checkArray($uniqeFields))
 			{
@@ -933,7 +933,7 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 	protected function _generateNewTitle($title)
 	{
 
-		// [5278] Alter the title
+		// [5279] Alter the title
 		$table = $this->getTable();
 
 		while ($table->load(array('title' => $title)))
diff --git a/admin/models/interventions.php b/admin/models/interventions.php
index e114f820..49cb6414 100644
--- a/admin/models/interventions.php
+++ b/admin/models/interventions.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -111,16 +111,16 @@ class CostbenefitprojectionModelInterventions extends JModelList
 	 */
 	public function getItems()
 	{ 
-		// [10544] check in items
+		// [10545] check in items
 		$this->checkInNow();
 
 		// load parent items
 		$items = parent::getItems();
 
-		// [10619] set values to display correctly.
+		// [10620] set values to display correctly.
 		if (CostbenefitprojectionHelper::checkArray($items))
 		{
-			// [10622] get user object.
+			// [10623] get user object.
 			$user = JFactory::getUser();
 			foreach ($items as $nr => &$item)
 			{
@@ -147,12 +147,12 @@ class CostbenefitprojectionModelInterventions extends JModelList
 			}
 		}  
 
-		// [10885] set selection value to a translatable value
+		// [10886] set selection value to a translatable value
 		if (CostbenefitprojectionHelper::checkArray($items))
 		{
 			foreach ($items as $nr => &$item)
 			{
-				// [10892] convert type
+				// [10893] convert type
 				$item->type = $this->selectionTranslation($item->type, 'type');
 			}
 		}
@@ -169,14 +169,14 @@ class CostbenefitprojectionModelInterventions extends JModelList
 	*/
 	public function selectionTranslation($value,$name)
 	{
-		// [10918] Array of type language strings
+		// [10919] Array of type language strings
 		if ($name == 'type')
 		{
 			$typeArray = array(
 				1 => 'COM_COSTBENEFITPROJECTION_INTERVENTION_SINGLE',
 				2 => 'COM_COSTBENEFITPROJECTION_INTERVENTION_CLUSTER'
 			);
-			// [10949] Now check if value is found in this array
+			// [10950] Now check if value is found in this array
 			if (isset($typeArray[$value]) && CostbenefitprojectionHelper::checkString($typeArray[$value]))
 			{
 				return $typeArray[$value];
@@ -192,16 +192,16 @@ class CostbenefitprojectionModelInterventions extends JModelList
 	 */
 	protected function getListQuery()
 	{
-		// [7405] Get the user object.
+		// [7406] Get the user object.
 		$user = JFactory::getUser();
-		// [7407] Create a new query object.
+		// [7408] Create a new query object.
 		$db = JFactory::getDBO();
 		$query = $db->getQuery(true);
 
-		// [7410] Select some fields
+		// [7411] Select some fields
 		$query->select('a.*');
 
-		// [7417] From the costbenefitprojection_item table
+		// [7418] From the costbenefitprojection_item table
 		$query->from($db->quoteName('#__costbenefitprojection_intervention', 'a'));
 
 		// Filter the companies (admin sees all)
@@ -221,11 +221,11 @@ class CostbenefitprojectionModelInterventions extends JModelList
 			}
 		}
 
-		// [7558] From the costbenefitprojection_company table.
+		// [7559] From the costbenefitprojection_company table.
 		$query->select($db->quoteName('g.name','company_name'));
 		$query->join('LEFT', $db->quoteName('#__costbenefitprojection_company', 'g') . ' ON (' . $db->quoteName('a.company') . ' = ' . $db->quoteName('g.id') . ')');
 
-		// [7431] Filter by published state
+		// [7432] Filter by published state
 		$published = $this->getState('filter.published');
 		if (is_numeric($published))
 		{
@@ -235,7 +235,7 @@ class CostbenefitprojectionModelInterventions extends JModelList
 		{
 			$query->where('(a.published = 0 OR a.published = 1)');
 		}
-		// [7528] Filter by search.
+		// [7529] Filter by search.
 		$search = $this->getState('filter.search');
 		if (!empty($search))
 		{
@@ -250,28 +250,28 @@ class CostbenefitprojectionModelInterventions extends JModelList
 			}
 		}
 
-		// [7762] Filter by company.
+		// [7763] Filter by company.
 		if ($company = $this->getState('filter.company'))
 		{
 			$query->where('a.company = ' . $db->quote($db->escape($company, true)));
 		}
-		// [7771] Filter by Type.
+		// [7772] Filter by Type.
 		if ($type = $this->getState('filter.type'))
 		{
 			$query->where('a.type = ' . $db->quote($db->escape($type, true)));
 		}
-		// [7771] Filter by Coverage.
+		// [7772] Filter by Coverage.
 		if ($coverage = $this->getState('filter.coverage'))
 		{
 			$query->where('a.coverage = ' . $db->quote($db->escape($coverage, true)));
 		}
-		// [7771] Filter by Duration.
+		// [7772] Filter by Duration.
 		if ($duration = $this->getState('filter.duration'))
 		{
 			$query->where('a.duration = ' . $db->quote($db->escape($duration, true)));
 		}
 
-		// [7487] Add the list ordering clause.
+		// [7488] Add the list ordering clause.
 		$orderCol = $this->state->get('list.ordering', 'a.id');
 		$orderDirn = $this->state->get('list.direction', 'asc');	
 		if ($orderCol != '')
@@ -289,19 +289,19 @@ class CostbenefitprojectionModelInterventions extends JModelList
 	*/
 	public function getExportData($pks)
 	{
-		// [7195] setup the query
+		// [7196] setup the query
 		if (CostbenefitprojectionHelper::checkArray($pks))
 		{
-			// [7198] Get the user object.
+			// [7199] Get the user object.
 			$user = JFactory::getUser();
-			// [7200] Create a new query object.
+			// [7201] Create a new query object.
 			$db = JFactory::getDBO();
 			$query = $db->getQuery(true);
 
-			// [7203] Select some fields
+			// [7204] Select some fields
 			$query->select('a.*');
 
-			// [7205] From the costbenefitprojection_intervention table
+			// [7206] From the costbenefitprojection_intervention table
 			$query->from($db->quoteName('#__costbenefitprojection_intervention', 'a'));
 			$query->where('a.id IN (' . implode(',',$pks) . ')');
 
@@ -322,20 +322,20 @@ class CostbenefitprojectionModelInterventions extends JModelList
 			}
 		}
 
-			// [7222] Order the results by ordering
+			// [7223] Order the results by ordering
 			$query->order('a.ordering  ASC');
 
-			// [7224] Load the items
+			// [7225] Load the items
 			$db->setQuery($query);
 			$db->execute();
 			if ($db->getNumRows())
 			{
 				$items = $db->loadObjectList();
 
-				// [10619] set values to display correctly.
+				// [10620] set values to display correctly.
 				if (CostbenefitprojectionHelper::checkArray($items))
 				{
-					// [10622] get user object.
+					// [10623] get user object.
 					$user = JFactory::getUser();
 					foreach ($items as $nr => &$item)
 					{
@@ -346,13 +346,13 @@ class CostbenefitprojectionModelInterventions extends JModelList
 							continue;
 						}
 
-						// [10832] unset the values we don't want exported.
+						// [10833] unset the values we don't want exported.
 						unset($item->asset_id);
 						unset($item->checked_out);
 						unset($item->checked_out_time);
 					}
 				}
-				// [10841] Add headers to items array.
+				// [10842] Add headers to items array.
 				$headers = $this->getExImPortHeaders();
 				if (CostbenefitprojectionHelper::checkObject($headers))
 				{
@@ -384,13 +384,13 @@ class CostbenefitprojectionModelInterventions extends JModelList
 	*/
 	public function getExImPortHeaders()
 	{
-		// [7244] Get a db connection.
+		// [7245] Get a db connection.
 		$db = JFactory::getDbo();
-		// [7246] get the columns
+		// [7247] get the columns
 		$columns = $db->getTableColumns("#__costbenefitprojection_intervention");
 		if (CostbenefitprojectionHelper::checkArray($columns))
 		{
-			// [7250] remove the headers you don't import/export.
+			// [7251] remove the headers you don't import/export.
 			unset($columns['asset_id']);
 			unset($columns['checked_out']);
 			unset($columns['checked_out_time']);
@@ -412,7 +412,7 @@ class CostbenefitprojectionModelInterventions extends JModelList
 	 */
 	protected function getStoreId($id = '')
 	{
-		// [10167] Compile the store id.
+		// [10168] Compile the store id.
 		$id .= ':' . $this->getState('filter.id');
 		$id .= ':' . $this->getState('filter.search');
 		$id .= ':' . $this->getState('filter.published');
@@ -437,15 +437,15 @@ class CostbenefitprojectionModelInterventions extends JModelList
 	*/
 	protected function checkInNow()
 	{
-		// [10560] Get set check in time
+		// [10561] Get set check in time
 		$time = JComponentHelper::getParams('com_costbenefitprojection')->get('check_in');
 		
 		if ($time)
 		{
 
-			// [10565] Get a db connection.
+			// [10566] Get a db connection.
 			$db = JFactory::getDbo();
-			// [10567] reset query
+			// [10568] reset query
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__costbenefitprojection_intervention'));
@@ -453,24 +453,24 @@ class CostbenefitprojectionModelInterventions extends JModelList
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// [10575] Get Yesterdays date
+				// [10576] Get Yesterdays date
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// [10577] reset query
+				// [10578] reset query
 				$query = $db->getQuery(true);
 
-				// [10579] Fields to update.
+				// [10580] Fields to update.
 				$fields = array(
 					$db->quoteName('checked_out_time') . '=\'0000-00-00 00:00:00\'',
 					$db->quoteName('checked_out') . '=0'
 				);
 
-				// [10584] Conditions for which records should be updated.
+				// [10585] Conditions for which records should be updated.
 				$conditions = array(
 					$db->quoteName('checked_out') . '!=0', 
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);
 
-				// [10589] Check table
+				// [10590] Check table
 				$query->update($db->quoteName('#__costbenefitprojection_intervention'))->set($fields)->where($conditions); 
 
 				$db->setQuery($query);
diff --git a/admin/models/scaling_factor.php b/admin/models/scaling_factor.php
index 9be1c36c..89718a7b 100644
--- a/admin/models/scaling_factor.php
+++ b/admin/models/scaling_factor.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -110,7 +110,7 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 	 * @since   1.6
 	 */
 	public function getForm($data = array(), $loadData = true)
-	{		// [9574] Get the form.
+	{		// [9575] Get the form.
 		$form = $this->loadForm('com_costbenefitprojection.scaling_factor', 'scaling_factor', array('control' => 'jform', 'load_data' => $loadData));
 
 		if (empty($form))
@@ -120,12 +120,12 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 
 		$jinput = JFactory::getApplication()->input;
 
-		// [9659] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first.
+		// [9660] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first.
 		if ($jinput->get('a_id'))
 		{
 			$id = $jinput->get('a_id', 0, 'INT');
 		}
-		// [9664] The back end uses id so we use that the rest of the time and set it to 0 by default.
+		// [9665] The back end uses id so we use that the rest of the time and set it to 0 by default.
 		else
 		{
 			$id = $jinput->get('id', 0, 'INT');
@@ -133,34 +133,34 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 
 		$user = JFactory::getUser();
 
-		// [9670] Check for existing item.
-		// [9671] Modify the form based on Edit State access controls.
+		// [9671] Check for existing item.
+		// [9672] Modify the form based on Edit State access controls.
 		if ($id != 0 && (!$user->authorise('scaling_factor.edit.state', 'com_costbenefitprojection.scaling_factor.' . (int) $id))
 			|| ($id == 0 && !$user->authorise('scaling_factor.edit.state', 'com_costbenefitprojection')))
 		{
-			// [9684] Disable fields for display.
+			// [9685] Disable fields for display.
 			$form->setFieldAttribute('ordering', 'disabled', 'true');
 			$form->setFieldAttribute('published', 'disabled', 'true');
-			// [9687] Disable fields while saving.
+			// [9688] Disable fields while saving.
 			$form->setFieldAttribute('ordering', 'filter', 'unset');
 			$form->setFieldAttribute('published', 'filter', 'unset');
 		}
-		// [9692] Modify the form based on Edit Creaded By access controls.
+		// [9693] Modify the form based on Edit Creaded By access controls.
 		if (!$user->authorise('core.edit.created_by', 'com_costbenefitprojection'))
 		{
-			// [9704] Disable fields for display.
+			// [9705] Disable fields for display.
 			$form->setFieldAttribute('created_by', 'disabled', 'true');
-			// [9706] Disable fields for display.
+			// [9707] Disable fields for display.
 			$form->setFieldAttribute('created_by', 'readonly', 'true');
-			// [9708] Disable fields while saving.
+			// [9709] Disable fields while saving.
 			$form->setFieldAttribute('created_by', 'filter', 'unset');
 		}
-		// [9711] Modify the form based on Edit Creaded Date access controls.
+		// [9712] Modify the form based on Edit Creaded Date access controls.
 		if (!$user->authorise('core.edit.created', 'com_costbenefitprojection'))
 		{
-			// [9723] Disable fields for display.
+			// [9724] Disable fields for display.
 			$form->setFieldAttribute('created', 'disabled', 'true');
-			// [9725] Disable fields while saving.
+			// [9726] Disable fields while saving.
 			$form->setFieldAttribute('created', 'filter', 'unset');
 		}
 
@@ -196,7 +196,7 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 			}
 
 			$user = JFactory::getUser();
-			// [9875] The record has been set. Check the record permissions.
+			// [9876] The record has been set. Check the record permissions.
 			return $user->authorise('scaling_factor.delete', 'com_costbenefitprojection.scaling_factor.' . (int) $record->id);
 		}
 		return false;
@@ -218,14 +218,14 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 
 		if ($recordId)
 		{
-			// [9962] The record has been set. Check the record permissions.
+			// [9963] The record has been set. Check the record permissions.
 			$permission = $user->authorise('scaling_factor.edit.state', 'com_costbenefitprojection.scaling_factor.' . (int) $recordId);
 			if (!$permission && !is_null($permission))
 			{
 				return false;
 			}
 		}
-		// [9979] In the absense of better information, revert to the component permissions.
+		// [9980] In the absense of better information, revert to the component permissions.
 		return $user->authorise('scaling_factor.edit.state', 'com_costbenefitprojection');
 	}
     
@@ -240,7 +240,7 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 	 */
 	protected function allowEdit($data = array(), $key = 'id')
 	{
-		// [9787] Check specific edit permission then general edit permission.
+		// [9788] Check specific edit permission then general edit permission.
 		$user = JFactory::getUser();
 		$recordId	= (int) isset($data[$key]) ? $data[$key] : 0;
 		if (!$user->authorise('core.options', 'com_costbenefitprojection'))
@@ -457,7 +457,7 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 	{
 		if (empty($this->batchSet))
 		{
-			// [4940] Set some needed variables.
+			// [4941] Set some needed variables.
 			$this->user 		= JFactory::getUser();
 			$this->table 		= $this->getTable();
 			$this->tableClassName	= get_class($this->table);
@@ -501,12 +501,12 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 			}
 		}
 
-		// [4960] get list of uniqe fields
+		// [4961] get list of uniqe fields
 		$uniqeFields = $this->getUniqeFields();
-		// [4962] remove move_copy from array
+		// [4963] remove move_copy from array
 		unset($values['move_copy']);
 
-		// [4965] make sure published is set
+		// [4966] make sure published is set
 		if (!isset($values['published']))
 		{
 			$values['published'] = 0;
@@ -518,21 +518,21 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 
 		$newIds = array();
 
-		// [5002] Parent exists so let's proceed
+		// [5003] Parent exists so let's proceed
 		while (!empty($pks))
 		{
-			// [5005] Pop the first ID off the stack
+			// [5006] Pop the first ID off the stack
 			$pk = array_shift($pks);
 
 			$this->table->reset();
 
-			// [5010] only allow copy if user may edit this item.
+			// [5011] only allow copy if user may edit this item.
 
 			if (!$this->user->authorise('scaling_factor.edit', $contexts[$pk]))
 
 			{
 
-				// [5020] Not fatal error
+				// [5021] Not fatal error
 
 				$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 
@@ -540,19 +540,19 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 
 			}
 
-			// [5025] Check that the row actually exists
+			// [5026] Check that the row actually exists
 			if (!$this->table->load($pk))
 			{
 				if ($error = $this->table->getError())
 				{
-					// [5030] Fatal error
+					// [5031] Fatal error
 					$this->setError($error);
 
 					return false;
 				}
 				else
 				{
-					// [5037] Not fatal error
+					// [5038] Not fatal error
 					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 					continue;
 				}
@@ -560,7 +560,7 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 
 			$this->table->causerisk = $this->generateUniqe('causerisk',$this->table->causerisk);
 
-			// [5073] insert all set values
+			// [5074] insert all set values
 			if (CostbenefitprojectionHelper::checkArray($values))
 			{
 				foreach ($values as $key => $value)
@@ -572,7 +572,7 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 				}
 			}
 
-			// [5085] update all uniqe fields
+			// [5086] update all uniqe fields
 			if (CostbenefitprojectionHelper::checkArray($uniqeFields))
 			{
 				foreach ($uniqeFields as $uniqeField)
@@ -581,13 +581,13 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 				}
 			}
 
-			// [5094] Reset the ID because we are making a copy
+			// [5095] Reset the ID because we are making a copy
 			$this->table->id = 0;
 
-			// [5097] TODO: Deal with ordering?
-			// [5098] $this->table->ordering	= 1;
+			// [5098] TODO: Deal with ordering?
+			// [5099] $this->table->ordering	= 1;
 
-			// [5100] Check the row.
+			// [5101] Check the row.
 			if (!$this->table->check())
 			{
 				$this->setError($this->table->getError());
@@ -600,7 +600,7 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 				$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
 			}
 
-			// [5113] Store the row.
+			// [5114] Store the row.
 			if (!$this->table->store())
 			{
 				$this->setError($this->table->getError());
@@ -608,14 +608,14 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 				return false;
 			}
 
-			// [5121] Get the new item ID
+			// [5122] Get the new item ID
 			$newId = $this->table->get('id');
 
-			// [5124] Add the new ID to the array
+			// [5125] Add the new ID to the array
 			$newIds[$pk] = $newId;
 		}
 
-		// [5128] Clean the cache
+		// [5129] Clean the cache
 		$this->cleanCache();
 
 		return $newIds;
@@ -636,7 +636,7 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 	{
 		if (empty($this->batchSet))
 		{
-			// [4742] Set some needed variables.
+			// [4743] Set some needed variables.
 			$this->user		= JFactory::getUser();
 			$this->table		= $this->getTable();
 			$this->tableClassName	= get_class($this->table);
@@ -681,15 +681,15 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 			}
 		}
 
-		// [4764] make sure published only updates if user has the permission.
+		// [4765] make sure published only updates if user has the permission.
 		if (isset($values['published']) && !$this->canDo->get('scaling_factor.edit.state'))
 		{
 			unset($values['published']);
 		}
-		// [4777] remove move_copy from array
+		// [4778] remove move_copy from array
 		unset($values['move_copy']);
 
-		// [4798] Parent exists so we proceed
+		// [4799] Parent exists so we proceed
 		foreach ($pks as $pk)
 		{
 			if (!$this->user->authorise('scaling_factor.edit', $contexts[$pk]))
@@ -699,30 +699,30 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 				return false;
 			}
 
-			// [4815] Check that the row actually exists
+			// [4816] Check that the row actually exists
 			if (!$this->table->load($pk))
 			{
 				if ($error = $this->table->getError())
 				{
-					// [4820] Fatal error
+					// [4821] Fatal error
 					$this->setError($error);
 
 					return false;
 				}
 				else
 				{
-					// [4827] Not fatal error
+					// [4828] Not fatal error
 					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 					continue;
 				}
 			}
 
-			// [4833] insert all set values.
+			// [4834] insert all set values.
 			if (CostbenefitprojectionHelper::checkArray($values))
 			{
 				foreach ($values as $key => $value)
 				{
-					// [4838] Do special action for access.
+					// [4839] Do special action for access.
 					if ('access' == $key && strlen($value) > 0)
 					{
 						$this->table->$key = $value;
@@ -735,7 +735,7 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 			}
 
 
-			// [4850] Check the row.
+			// [4851] Check the row.
 			if (!$this->table->check())
 			{
 				$this->setError($this->table->getError());
@@ -748,7 +748,7 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 				$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
 			}
 
-			// [4863] Store the row.
+			// [4864] Store the row.
 			if (!$this->table->store())
 			{
 				$this->setError($this->table->getError());
@@ -757,7 +757,7 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 			}
 		}
 
-		// [4872] Clean the cache
+		// [4873] Clean the cache
 		$this->cleanCache();
 
 		return true;
@@ -795,10 +795,10 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 			$data['params'] = (string) $params;
 		}
 
-		// [5220] Alter the uniqe field for save as copy
+		// [5221] Alter the uniqe field for save as copy
 		if ($input->get('task') == 'save2copy')
 		{
-			// [5223] Automatic handling of other uniqe fields
+			// [5224] Automatic handling of other uniqe fields
 			$uniqeFields = $this->getUniqeFields();
 			if (CostbenefitprojectionHelper::checkArray($uniqeFields))
 			{
@@ -851,7 +851,7 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 	protected function _generateNewTitle($title)
 	{
 
-		// [5278] Alter the title
+		// [5279] Alter the title
 		$table = $this->getTable();
 
 		while ($table->load(array('title' => $title)))
diff --git a/admin/models/scaling_factors.php b/admin/models/scaling_factors.php
index c6591a3f..fbb6711f 100644
--- a/admin/models/scaling_factors.php
+++ b/admin/models/scaling_factors.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -119,16 +119,16 @@ class CostbenefitprojectionModelScaling_factors extends JModelList
 	 */
 	public function getItems()
 	{ 
-		// [10544] check in items
+		// [10545] check in items
 		$this->checkInNow();
 
 		// load parent items
 		$items = parent::getItems();
 
-		// [10619] set values to display correctly.
+		// [10620] set values to display correctly.
 		if (CostbenefitprojectionHelper::checkArray($items))
 		{
-			// [10622] get user object.
+			// [10623] get user object.
 			$user = JFactory::getUser();
 			foreach ($items as $nr => &$item)
 			{
@@ -153,16 +153,16 @@ class CostbenefitprojectionModelScaling_factors extends JModelList
 	 */
 	protected function getListQuery()
 	{
-		// [7405] Get the user object.
+		// [7406] Get the user object.
 		$user = JFactory::getUser();
-		// [7407] Create a new query object.
+		// [7408] Create a new query object.
 		$db = JFactory::getDBO();
 		$query = $db->getQuery(true);
 
-		// [7410] Select some fields
+		// [7411] Select some fields
 		$query->select('a.*');
 
-		// [7417] From the costbenefitprojection_item table
+		// [7418] From the costbenefitprojection_item table
 		$query->from($db->quoteName('#__costbenefitprojection_scaling_factor', 'a'));
 
 		// Filter by companies (admin sees all)
@@ -182,15 +182,15 @@ class CostbenefitprojectionModelScaling_factors extends JModelList
 			}
 		}
 
-		// [7558] From the costbenefitprojection_causerisk table.
+		// [7559] From the costbenefitprojection_causerisk table.
 		$query->select($db->quoteName('g.name','causerisk_name'));
 		$query->join('LEFT', $db->quoteName('#__costbenefitprojection_causerisk', 'g') . ' ON (' . $db->quoteName('a.causerisk') . ' = ' . $db->quoteName('g.id') . ')');
 
-		// [7558] From the costbenefitprojection_company table.
+		// [7559] From the costbenefitprojection_company table.
 		$query->select($db->quoteName('h.name','company_name'));
 		$query->join('LEFT', $db->quoteName('#__costbenefitprojection_company', 'h') . ' ON (' . $db->quoteName('a.company') . ' = ' . $db->quoteName('h.id') . ')');
 
-		// [7431] Filter by published state
+		// [7432] Filter by published state
 		$published = $this->getState('filter.published');
 		if (is_numeric($published))
 		{
@@ -200,7 +200,7 @@ class CostbenefitprojectionModelScaling_factors extends JModelList
 		{
 			$query->where('(a.published = 0 OR a.published = 1)');
 		}
-		// [7528] Filter by search.
+		// [7529] Filter by search.
 		$search = $this->getState('filter.search');
 		if (!empty($search))
 		{
@@ -215,18 +215,18 @@ class CostbenefitprojectionModelScaling_factors extends JModelList
 			}
 		}
 
-		// [7762] Filter by causerisk.
+		// [7763] Filter by causerisk.
 		if ($causerisk = $this->getState('filter.causerisk'))
 		{
 			$query->where('a.causerisk = ' . $db->quote($db->escape($causerisk, true)));
 		}
-		// [7762] Filter by company.
+		// [7763] Filter by company.
 		if ($company = $this->getState('filter.company'))
 		{
 			$query->where('a.company = ' . $db->quote($db->escape($company, true)));
 		}
 
-		// [7487] Add the list ordering clause.
+		// [7488] Add the list ordering clause.
 		$orderCol = $this->state->get('list.ordering', 'a.id');
 		$orderDirn = $this->state->get('list.direction', 'asc');	
 		if ($orderCol != '')
@@ -244,19 +244,19 @@ class CostbenefitprojectionModelScaling_factors extends JModelList
 	*/
 	public function getExportData($pks)
 	{
-		// [7195] setup the query
+		// [7196] setup the query
 		if (CostbenefitprojectionHelper::checkArray($pks))
 		{
-			// [7198] Get the user object.
+			// [7199] Get the user object.
 			$user = JFactory::getUser();
-			// [7200] Create a new query object.
+			// [7201] Create a new query object.
 			$db = JFactory::getDBO();
 			$query = $db->getQuery(true);
 
-			// [7203] Select some fields
+			// [7204] Select some fields
 			$query->select('a.*');
 
-			// [7205] From the costbenefitprojection_scaling_factor table
+			// [7206] From the costbenefitprojection_scaling_factor table
 			$query->from($db->quoteName('#__costbenefitprojection_scaling_factor', 'a'));
 			$query->where('a.id IN (' . implode(',',$pks) . ')');
 
@@ -277,20 +277,20 @@ class CostbenefitprojectionModelScaling_factors extends JModelList
 			}
 		}
 
-			// [7222] Order the results by ordering
+			// [7223] Order the results by ordering
 			$query->order('a.ordering  ASC');
 
-			// [7224] Load the items
+			// [7225] Load the items
 			$db->setQuery($query);
 			$db->execute();
 			if ($db->getNumRows())
 			{
 				$items = $db->loadObjectList();
 
-				// [10619] set values to display correctly.
+				// [10620] set values to display correctly.
 				if (CostbenefitprojectionHelper::checkArray($items))
 				{
-					// [10622] get user object.
+					// [10623] get user object.
 					$user = JFactory::getUser();
 					foreach ($items as $nr => &$item)
 					{
@@ -301,13 +301,13 @@ class CostbenefitprojectionModelScaling_factors extends JModelList
 							continue;
 						}
 
-						// [10832] unset the values we don't want exported.
+						// [10833] unset the values we don't want exported.
 						unset($item->asset_id);
 						unset($item->checked_out);
 						unset($item->checked_out_time);
 					}
 				}
-				// [10841] Add headers to items array.
+				// [10842] Add headers to items array.
 				$headers = $this->getExImPortHeaders();
 				if (CostbenefitprojectionHelper::checkObject($headers))
 				{
@@ -326,13 +326,13 @@ class CostbenefitprojectionModelScaling_factors extends JModelList
 	*/
 	public function getExImPortHeaders()
 	{
-		// [7244] Get a db connection.
+		// [7245] Get a db connection.
 		$db = JFactory::getDbo();
-		// [7246] get the columns
+		// [7247] get the columns
 		$columns = $db->getTableColumns("#__costbenefitprojection_scaling_factor");
 		if (CostbenefitprojectionHelper::checkArray($columns))
 		{
-			// [7250] remove the headers you don't import/export.
+			// [7251] remove the headers you don't import/export.
 			unset($columns['asset_id']);
 			unset($columns['checked_out']);
 			unset($columns['checked_out_time']);
@@ -354,7 +354,7 @@ class CostbenefitprojectionModelScaling_factors extends JModelList
 	 */
 	protected function getStoreId($id = '')
 	{
-		// [10167] Compile the store id.
+		// [10168] Compile the store id.
 		$id .= ':' . $this->getState('filter.id');
 		$id .= ':' . $this->getState('filter.search');
 		$id .= ':' . $this->getState('filter.published');
@@ -381,15 +381,15 @@ class CostbenefitprojectionModelScaling_factors extends JModelList
 	*/
 	protected function checkInNow()
 	{
-		// [10560] Get set check in time
+		// [10561] Get set check in time
 		$time = JComponentHelper::getParams('com_costbenefitprojection')->get('check_in');
 		
 		if ($time)
 		{
 
-			// [10565] Get a db connection.
+			// [10566] Get a db connection.
 			$db = JFactory::getDbo();
-			// [10567] reset query
+			// [10568] reset query
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__costbenefitprojection_scaling_factor'));
@@ -397,24 +397,24 @@ class CostbenefitprojectionModelScaling_factors extends JModelList
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// [10575] Get Yesterdays date
+				// [10576] Get Yesterdays date
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// [10577] reset query
+				// [10578] reset query
 				$query = $db->getQuery(true);
 
-				// [10579] Fields to update.
+				// [10580] Fields to update.
 				$fields = array(
 					$db->quoteName('checked_out_time') . '=\'0000-00-00 00:00:00\'',
 					$db->quoteName('checked_out') . '=0'
 				);
 
-				// [10584] Conditions for which records should be updated.
+				// [10585] Conditions for which records should be updated.
 				$conditions = array(
 					$db->quoteName('checked_out') . '!=0', 
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);
 
-				// [10589] Check table
+				// [10590] Check table
 				$query->update($db->quoteName('#__costbenefitprojection_scaling_factor'))->set($fields)->where($conditions); 
 
 				$db->setQuery($query);
diff --git a/admin/models/service_provider.php b/admin/models/service_provider.php
index 9e09f68c..4484002e 100644
--- a/admin/models/service_provider.php
+++ b/admin/models/service_provider.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -95,7 +95,7 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 				$item->tags->getTagIds($item->id, 'com_costbenefitprojection.service_provider');
 			}
 		}
-		$this->serviceproviderhizj = $item->id;
+		$this->serviceproviderrnkc = $item->id;
 
 		return $item;
 	}
@@ -105,18 +105,18 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 	*
 	* @return mixed  An array of data items on success, false on failure.
 	*/
-	public function getQqtcompanies()
+	public function getZducompanies()
 	{
-		// [6953] Get the user object.
+		// [6954] Get the user object.
 		$user = JFactory::getUser();
-		// [6955] Create a new query object.
+		// [6956] Create a new query object.
 		$db = JFactory::getDBO();
 		$query = $db->getQuery(true);
 
-		// [6958] Select some fields
+		// [6959] Select some fields
 		$query->select('a.*');
 
-		// [6965] From the costbenefitprojection_company table
+		// [6966] From the costbenefitprojection_company table
 		$query->from($db->quoteName('#__costbenefitprojection_company', 'a'));
 
 		// Filter by companies (admin sees all)
@@ -136,62 +136,62 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 			}
 		}
 
-		// [7558] From the users table.
+		// [7559] From the users table.
 		$query->select($db->quoteName('g.name','user_name'));
 		$query->join('LEFT', $db->quoteName('#__users', 'g') . ' ON (' . $db->quoteName('a.user') . ' = ' . $db->quoteName('g.id') . ')');
 
-		// [7558] From the costbenefitprojection_country table.
+		// [7559] From the costbenefitprojection_country table.
 		$query->select($db->quoteName('h.name','country_name'));
 		$query->join('LEFT', $db->quoteName('#__costbenefitprojection_country', 'h') . ' ON (' . $db->quoteName('a.country') . ' = ' . $db->quoteName('h.id') . ')');
 
-		// [7558] From the costbenefitprojection_service_provider table.
+		// [7559] From the costbenefitprojection_service_provider table.
 		$query->select($db->quoteName('i.user','serviceprovider_user'));
 		$query->join('LEFT', $db->quoteName('#__costbenefitprojection_service_provider', 'i') . ' ON (' . $db->quoteName('a.serviceprovider') . ' = ' . $db->quoteName('i.id') . ')');
 
-		// [6981] Filter by serviceproviderhizj global.
-		$serviceproviderhizj = $this->serviceproviderhizj;
-		if (is_numeric($serviceproviderhizj ))
+		// [6982] Filter by serviceproviderrnkc global.
+		$serviceproviderrnkc = $this->serviceproviderrnkc;
+		if (is_numeric($serviceproviderrnkc ))
 		{
-			$query->where('a.serviceprovider = ' . (int) $serviceproviderhizj );
+			$query->where('a.serviceprovider = ' . (int) $serviceproviderrnkc );
 		}
-		elseif (is_string($serviceproviderhizj))
+		elseif (is_string($serviceproviderrnkc))
 		{
-			$query->where('a.serviceprovider = ' . $db->quote($serviceproviderhizj));
+			$query->where('a.serviceprovider = ' . $db->quote($serviceproviderrnkc));
 		}
 		else
 		{
 			$query->where('a.serviceprovider = -5');
 		}
 
-		// [6998] Join over the asset groups.
+		// [6999] Join over the asset groups.
 		$query->select('ag.title AS access_level');
 		$query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
-		// [7001] Filter by access level.
+		// [7002] Filter by access level.
 		if ($access = $this->getState('filter.access'))
 		{
 			$query->where('a.access = ' . (int) $access);
 		}
-		// [7006] Implement View Level Access
+		// [7007] Implement View Level Access
 		if (!$user->authorise('core.options', 'com_costbenefitprojection'))
 		{
 			$groups = implode(',', $user->getAuthorisedViewLevels());
 			$query->where('a.access IN (' . $groups . ')');
 		}
 
-		// [7013] Order the results by ordering
+		// [7014] Order the results by ordering
 		$query->order('a.ordering  ASC');
 
-		// [7015] Load the items
+		// [7016] Load the items
 		$db->setQuery($query);
 		$db->execute();
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [10619] set values to display correctly.
+			// [10620] set values to display correctly.
 			if (CostbenefitprojectionHelper::checkArray($items))
 			{
-				// [10622] get user object.
+				// [10623] get user object.
 				$user = JFactory::getUser();
 				foreach ($items as $nr => &$item)
 				{
@@ -205,15 +205,15 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 				}
 			}
 
-			// [10885] set selection value to a translatable value
+			// [10886] set selection value to a translatable value
 			if (CostbenefitprojectionHelper::checkArray($items))
 			{
 				foreach ($items as $nr => &$item)
 				{
-					// [10892] convert department
-					$item->department = $this->selectionTranslationQqtcompanies($item->department, 'department');
-					// [10892] convert per
-					$item->per = $this->selectionTranslationQqtcompanies($item->per, 'per');
+					// [10893] convert department
+					$item->department = $this->selectionTranslationZducompanies($item->department, 'department');
+					// [10893] convert per
+					$item->per = $this->selectionTranslationZducompanies($item->per, 'per');
 				}
 			}
 
@@ -227,29 +227,29 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 	*
 	* @return translatable string
 	*/
-	public function selectionTranslationQqtcompanies($value,$name)
+	public function selectionTranslationZducompanies($value,$name)
 	{
-		// [10918] Array of department language strings
+		// [10919] Array of department language strings
 		if ($name == 'department')
 		{
 			$departmentArray = array(
 				1 => 'COM_COSTBENEFITPROJECTION_COMPANY_BASIC',
 				2 => 'COM_COSTBENEFITPROJECTION_COMPANY_ADVANCED'
 			);
-			// [10949] Now check if value is found in this array
+			// [10950] Now check if value is found in this array
 			if (isset($departmentArray[$value]) && CostbenefitprojectionHelper::checkString($departmentArray[$value]))
 			{
 				return $departmentArray[$value];
 			}
 		}
-		// [10918] Array of per language strings
+		// [10919] Array of per language strings
 		if ($name == 'per')
 		{
 			$perArray = array(
 				1 => 'COM_COSTBENEFITPROJECTION_COMPANY_OPEN',
 				0 => 'COM_COSTBENEFITPROJECTION_COMPANY_LOCKED'
 			);
-			// [10949] Now check if value is found in this array
+			// [10950] Now check if value is found in this array
 			if (isset($perArray[$value]) && CostbenefitprojectionHelper::checkString($perArray[$value]))
 			{
 				return $perArray[$value];
@@ -269,7 +269,7 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 	 * @since   1.6
 	 */
 	public function getForm($data = array(), $loadData = true)
-	{		// [9574] Get the form.
+	{		// [9575] Get the form.
 		$form = $this->loadForm('com_costbenefitprojection.service_provider', 'service_provider', array('control' => 'jform', 'load_data' => $loadData));
 
 		if (empty($form))
@@ -279,12 +279,12 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 
 		$jinput = JFactory::getApplication()->input;
 
-		// [9659] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first.
+		// [9660] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first.
 		if ($jinput->get('a_id'))
 		{
 			$id = $jinput->get('a_id', 0, 'INT');
 		}
-		// [9664] The back end uses id so we use that the rest of the time and set it to 0 by default.
+		// [9665] The back end uses id so we use that the rest of the time and set it to 0 by default.
 		else
 		{
 			$id = $jinput->get('id', 0, 'INT');
@@ -292,34 +292,34 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 
 		$user = JFactory::getUser();
 
-		// [9670] Check for existing item.
-		// [9671] Modify the form based on Edit State access controls.
+		// [9671] Check for existing item.
+		// [9672] Modify the form based on Edit State access controls.
 		if ($id != 0 && (!$user->authorise('service_provider.edit.state', 'com_costbenefitprojection.service_provider.' . (int) $id))
 			|| ($id == 0 && !$user->authorise('service_provider.edit.state', 'com_costbenefitprojection')))
 		{
-			// [9684] Disable fields for display.
+			// [9685] Disable fields for display.
 			$form->setFieldAttribute('ordering', 'disabled', 'true');
 			$form->setFieldAttribute('published', 'disabled', 'true');
-			// [9687] Disable fields while saving.
+			// [9688] Disable fields while saving.
 			$form->setFieldAttribute('ordering', 'filter', 'unset');
 			$form->setFieldAttribute('published', 'filter', 'unset');
 		}
-		// [9692] Modify the form based on Edit Creaded By access controls.
+		// [9693] Modify the form based on Edit Creaded By access controls.
 		if (!$user->authorise('core.edit.created_by', 'com_costbenefitprojection'))
 		{
-			// [9704] Disable fields for display.
+			// [9705] Disable fields for display.
 			$form->setFieldAttribute('created_by', 'disabled', 'true');
-			// [9706] Disable fields for display.
+			// [9707] Disable fields for display.
 			$form->setFieldAttribute('created_by', 'readonly', 'true');
-			// [9708] Disable fields while saving.
+			// [9709] Disable fields while saving.
 			$form->setFieldAttribute('created_by', 'filter', 'unset');
 		}
-		// [9711] Modify the form based on Edit Creaded Date access controls.
+		// [9712] Modify the form based on Edit Creaded Date access controls.
 		if (!$user->authorise('core.edit.created', 'com_costbenefitprojection'))
 		{
-			// [9723] Disable fields for display.
+			// [9724] Disable fields for display.
 			$form->setFieldAttribute('created', 'disabled', 'true');
-			// [9725] Disable fields while saving.
+			// [9726] Disable fields while saving.
 			$form->setFieldAttribute('created', 'filter', 'unset');
 		}
 
@@ -355,7 +355,7 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 			}
 
 			$user = JFactory::getUser();
-			// [9875] The record has been set. Check the record permissions.
+			// [9876] The record has been set. Check the record permissions.
 			return $user->authorise('service_provider.delete', 'com_costbenefitprojection.service_provider.' . (int) $record->id);
 		}
 		return false;
@@ -377,14 +377,14 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 
 		if ($recordId)
 		{
-			// [9962] The record has been set. Check the record permissions.
+			// [9963] The record has been set. Check the record permissions.
 			$permission = $user->authorise('service_provider.edit.state', 'com_costbenefitprojection.service_provider.' . (int) $recordId);
 			if (!$permission && !is_null($permission))
 			{
 				return false;
 			}
 		}
-		// [9979] In the absense of better information, revert to the component permissions.
+		// [9980] In the absense of better information, revert to the component permissions.
 		return $user->authorise('service_provider.edit.state', 'com_costbenefitprojection');
 	}
     
@@ -399,7 +399,7 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 	 */
 	protected function allowEdit($data = array(), $key = 'id')
 	{
-		// [9787] Check specific edit permission then general edit permission.
+		// [9788] Check specific edit permission then general edit permission.
 		$user = JFactory::getUser();
 		$recordId	= (int) isset($data[$key]) ? $data[$key] : 0;
 		if (!$user->authorise('core.options', 'com_costbenefitprojection'))
@@ -615,7 +615,7 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 	{
 		if (empty($this->batchSet))
 		{
-			// [4940] Set some needed variables.
+			// [4941] Set some needed variables.
 			$this->user 		= JFactory::getUser();
 			$this->table 		= $this->getTable();
 			$this->tableClassName	= get_class($this->table);
@@ -659,12 +659,12 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 			}
 		}
 
-		// [4960] get list of uniqe fields
+		// [4961] get list of uniqe fields
 		$uniqeFields = $this->getUniqeFields();
-		// [4962] remove move_copy from array
+		// [4963] remove move_copy from array
 		unset($values['move_copy']);
 
-		// [4965] make sure published is set
+		// [4966] make sure published is set
 		if (!isset($values['published']))
 		{
 			$values['published'] = 0;
@@ -676,21 +676,21 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 
 		$newIds = array();
 
-		// [5002] Parent exists so let's proceed
+		// [5003] Parent exists so let's proceed
 		while (!empty($pks))
 		{
-			// [5005] Pop the first ID off the stack
+			// [5006] Pop the first ID off the stack
 			$pk = array_shift($pks);
 
 			$this->table->reset();
 
-			// [5010] only allow copy if user may edit this item.
+			// [5011] only allow copy if user may edit this item.
 
 			if (!$this->user->authorise('service_provider.edit', $contexts[$pk]))
 
 			{
 
-				// [5020] Not fatal error
+				// [5021] Not fatal error
 
 				$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 
@@ -698,25 +698,25 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 
 			}
 
-			// [5025] Check that the row actually exists
+			// [5026] Check that the row actually exists
 			if (!$this->table->load($pk))
 			{
 				if ($error = $this->table->getError())
 				{
-					// [5030] Fatal error
+					// [5031] Fatal error
 					$this->setError($error);
 
 					return false;
 				}
 				else
 				{
-					// [5037] Not fatal error
+					// [5038] Not fatal error
 					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 					continue;
 				}
 			}
 
-			// [5073] insert all set values
+			// [5074] insert all set values
 			if (CostbenefitprojectionHelper::checkArray($values))
 			{
 				foreach ($values as $key => $value)
@@ -728,7 +728,7 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 				}
 			}
 
-			// [5085] update all uniqe fields
+			// [5086] update all uniqe fields
 			if (CostbenefitprojectionHelper::checkArray($uniqeFields))
 			{
 				foreach ($uniqeFields as $uniqeField)
@@ -737,13 +737,13 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 				}
 			}
 
-			// [5094] Reset the ID because we are making a copy
+			// [5095] Reset the ID because we are making a copy
 			$this->table->id = 0;
 
-			// [5097] TODO: Deal with ordering?
-			// [5098] $this->table->ordering	= 1;
+			// [5098] TODO: Deal with ordering?
+			// [5099] $this->table->ordering	= 1;
 
-			// [5100] Check the row.
+			// [5101] Check the row.
 			if (!$this->table->check())
 			{
 				$this->setError($this->table->getError());
@@ -756,7 +756,7 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 				$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
 			}
 
-			// [5113] Store the row.
+			// [5114] Store the row.
 			if (!$this->table->store())
 			{
 				$this->setError($this->table->getError());
@@ -764,14 +764,14 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 				return false;
 			}
 
-			// [5121] Get the new item ID
+			// [5122] Get the new item ID
 			$newId = $this->table->get('id');
 
-			// [5124] Add the new ID to the array
+			// [5125] Add the new ID to the array
 			$newIds[$pk] = $newId;
 		}
 
-		// [5128] Clean the cache
+		// [5129] Clean the cache
 		$this->cleanCache();
 
 		return $newIds;
@@ -792,7 +792,7 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 	{
 		if (empty($this->batchSet))
 		{
-			// [4742] Set some needed variables.
+			// [4743] Set some needed variables.
 			$this->user		= JFactory::getUser();
 			$this->table		= $this->getTable();
 			$this->tableClassName	= get_class($this->table);
@@ -836,15 +836,15 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 			}
 		}
 
-		// [4764] make sure published only updates if user has the permission.
+		// [4765] make sure published only updates if user has the permission.
 		if (isset($values['published']) && !$this->canDo->get('service_provider.edit.state'))
 		{
 			unset($values['published']);
 		}
-		// [4777] remove move_copy from array
+		// [4778] remove move_copy from array
 		unset($values['move_copy']);
 
-		// [4798] Parent exists so we proceed
+		// [4799] Parent exists so we proceed
 		foreach ($pks as $pk)
 		{
 			if (!$this->user->authorise('service_provider.edit', $contexts[$pk]))
@@ -854,30 +854,30 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 				return false;
 			}
 
-			// [4815] Check that the row actually exists
+			// [4816] Check that the row actually exists
 			if (!$this->table->load($pk))
 			{
 				if ($error = $this->table->getError())
 				{
-					// [4820] Fatal error
+					// [4821] Fatal error
 					$this->setError($error);
 
 					return false;
 				}
 				else
 				{
-					// [4827] Not fatal error
+					// [4828] Not fatal error
 					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 					continue;
 				}
 			}
 
-			// [4833] insert all set values.
+			// [4834] insert all set values.
 			if (CostbenefitprojectionHelper::checkArray($values))
 			{
 				foreach ($values as $key => $value)
 				{
-					// [4838] Do special action for access.
+					// [4839] Do special action for access.
 					if ('access' == $key && strlen($value) > 0)
 					{
 						$this->table->$key = $value;
@@ -890,7 +890,7 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 			}
 
 
-			// [4850] Check the row.
+			// [4851] Check the row.
 			if (!$this->table->check())
 			{
 				$this->setError($this->table->getError());
@@ -903,7 +903,7 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 				$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
 			}
 
-			// [4863] Store the row.
+			// [4864] Store the row.
 			if (!$this->table->store())
 			{
 				$this->setError($this->table->getError());
@@ -912,7 +912,7 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 			}
 		}
 
-		// [4872] Clean the cache
+		// [4873] Clean the cache
 		$this->cleanCache();
 
 		return true;
@@ -950,10 +950,10 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 			$data['params'] = (string) $params;
 		}
 
-		// [5220] Alter the uniqe field for save as copy
+		// [5221] Alter the uniqe field for save as copy
 		if ($input->get('task') == 'save2copy')
 		{
-			// [5223] Automatic handling of other uniqe fields
+			// [5224] Automatic handling of other uniqe fields
 			$uniqeFields = $this->getUniqeFields();
 			if (CostbenefitprojectionHelper::checkArray($uniqeFields))
 			{
@@ -1006,7 +1006,7 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 	protected function _generateNewTitle($title)
 	{
 
-		// [5278] Alter the title
+		// [5279] Alter the title
 		$table = $this->getTable();
 
 		while ($table->load(array('title' => $title)))
diff --git a/admin/models/service_providers.php b/admin/models/service_providers.php
index be05fc6a..4ce6fc54 100644
--- a/admin/models/service_providers.php
+++ b/admin/models/service_providers.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -107,16 +107,16 @@ class CostbenefitprojectionModelService_providers extends JModelList
 	 */
 	public function getItems()
 	{ 
-		// [10544] check in items
+		// [10545] check in items
 		$this->checkInNow();
 
 		// load parent items
 		$items = parent::getItems();
 
-		// [10619] set values to display correctly.
+		// [10620] set values to display correctly.
 		if (CostbenefitprojectionHelper::checkArray($items))
 		{
-			// [10622] get user object.
+			// [10623] get user object.
 			$user = JFactory::getUser();
 			foreach ($items as $nr => &$item)
 			{
@@ -141,16 +141,16 @@ class CostbenefitprojectionModelService_providers extends JModelList
 	 */
 	protected function getListQuery()
 	{
-		// [7405] Get the user object.
+		// [7406] Get the user object.
 		$user = JFactory::getUser();
-		// [7407] Create a new query object.
+		// [7408] Create a new query object.
 		$db = JFactory::getDBO();
 		$query = $db->getQuery(true);
 
-		// [7410] Select some fields
+		// [7411] Select some fields
 		$query->select('a.*');
 
-		// [7417] From the costbenefitprojection_item table
+		// [7418] From the costbenefitprojection_item table
 		$query->from($db->quoteName('#__costbenefitprojection_service_provider', 'a'));
 
 		// Filter the providers (admin sees all)
@@ -170,15 +170,15 @@ class CostbenefitprojectionModelService_providers extends JModelList
 			}
 		}
 
-		// [7558] From the users table.
+		// [7559] From the users table.
 		$query->select($db->quoteName('g.name','user_name'));
 		$query->join('LEFT', $db->quoteName('#__users', 'g') . ' ON (' . $db->quoteName('a.user') . ' = ' . $db->quoteName('g.id') . ')');
 
-		// [7558] From the costbenefitprojection_country table.
+		// [7559] From the costbenefitprojection_country table.
 		$query->select($db->quoteName('h.name','country_name'));
 		$query->join('LEFT', $db->quoteName('#__costbenefitprojection_country', 'h') . ' ON (' . $db->quoteName('a.country') . ' = ' . $db->quoteName('h.id') . ')');
 
-		// [7431] Filter by published state
+		// [7432] Filter by published state
 		$published = $this->getState('filter.published');
 		if (is_numeric($published))
 		{
@@ -188,7 +188,7 @@ class CostbenefitprojectionModelService_providers extends JModelList
 		{
 			$query->where('(a.published = 0 OR a.published = 1)');
 		}
-		// [7528] Filter by search.
+		// [7529] Filter by search.
 		$search = $this->getState('filter.search');
 		if (!empty($search))
 		{
@@ -203,13 +203,13 @@ class CostbenefitprojectionModelService_providers extends JModelList
 			}
 		}
 
-		// [7762] Filter by country.
+		// [7763] Filter by country.
 		if ($country = $this->getState('filter.country'))
 		{
 			$query->where('a.country = ' . $db->quote($db->escape($country, true)));
 		}
 
-		// [7487] Add the list ordering clause.
+		// [7488] Add the list ordering clause.
 		$orderCol = $this->state->get('list.ordering', 'a.id');
 		$orderDirn = $this->state->get('list.direction', 'asc');	
 		if ($orderCol != '')
@@ -227,19 +227,19 @@ class CostbenefitprojectionModelService_providers extends JModelList
 	*/
 	public function getExportData($pks)
 	{
-		// [7195] setup the query
+		// [7196] setup the query
 		if (CostbenefitprojectionHelper::checkArray($pks))
 		{
-			// [7198] Get the user object.
+			// [7199] Get the user object.
 			$user = JFactory::getUser();
-			// [7200] Create a new query object.
+			// [7201] Create a new query object.
 			$db = JFactory::getDBO();
 			$query = $db->getQuery(true);
 
-			// [7203] Select some fields
+			// [7204] Select some fields
 			$query->select('a.*');
 
-			// [7205] From the costbenefitprojection_service_provider table
+			// [7206] From the costbenefitprojection_service_provider table
 			$query->from($db->quoteName('#__costbenefitprojection_service_provider', 'a'));
 			$query->where('a.id IN (' . implode(',',$pks) . ')');
 
@@ -260,20 +260,20 @@ class CostbenefitprojectionModelService_providers extends JModelList
 			}
 		}
 
-			// [7222] Order the results by ordering
+			// [7223] Order the results by ordering
 			$query->order('a.ordering  ASC');
 
-			// [7224] Load the items
+			// [7225] Load the items
 			$db->setQuery($query);
 			$db->execute();
 			if ($db->getNumRows())
 			{
 				$items = $db->loadObjectList();
 
-				// [10619] set values to display correctly.
+				// [10620] set values to display correctly.
 				if (CostbenefitprojectionHelper::checkArray($items))
 				{
-					// [10622] get user object.
+					// [10623] get user object.
 					$user = JFactory::getUser();
 					foreach ($items as $nr => &$item)
 					{
@@ -284,13 +284,13 @@ class CostbenefitprojectionModelService_providers extends JModelList
 							continue;
 						}
 
-						// [10832] unset the values we don't want exported.
+						// [10833] unset the values we don't want exported.
 						unset($item->asset_id);
 						unset($item->checked_out);
 						unset($item->checked_out_time);
 					}
 				}
-				// [10841] Add headers to items array.
+				// [10842] Add headers to items array.
 				$headers = $this->getExImPortHeaders();
 				if (CostbenefitprojectionHelper::checkObject($headers))
 				{
@@ -309,13 +309,13 @@ class CostbenefitprojectionModelService_providers extends JModelList
 	*/
 	public function getExImPortHeaders()
 	{
-		// [7244] Get a db connection.
+		// [7245] Get a db connection.
 		$db = JFactory::getDbo();
-		// [7246] get the columns
+		// [7247] get the columns
 		$columns = $db->getTableColumns("#__costbenefitprojection_service_provider");
 		if (CostbenefitprojectionHelper::checkArray($columns))
 		{
-			// [7250] remove the headers you don't import/export.
+			// [7251] remove the headers you don't import/export.
 			unset($columns['asset_id']);
 			unset($columns['checked_out']);
 			unset($columns['checked_out_time']);
@@ -337,7 +337,7 @@ class CostbenefitprojectionModelService_providers extends JModelList
 	 */
 	protected function getStoreId($id = '')
 	{
-		// [10167] Compile the store id.
+		// [10168] Compile the store id.
 		$id .= ':' . $this->getState('filter.id');
 		$id .= ':' . $this->getState('filter.search');
 		$id .= ':' . $this->getState('filter.published');
@@ -361,15 +361,15 @@ class CostbenefitprojectionModelService_providers extends JModelList
 	*/
 	protected function checkInNow()
 	{
-		// [10560] Get set check in time
+		// [10561] Get set check in time
 		$time = JComponentHelper::getParams('com_costbenefitprojection')->get('check_in');
 		
 		if ($time)
 		{
 
-			// [10565] Get a db connection.
+			// [10566] Get a db connection.
 			$db = JFactory::getDbo();
-			// [10567] reset query
+			// [10568] reset query
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__costbenefitprojection_service_provider'));
@@ -377,24 +377,24 @@ class CostbenefitprojectionModelService_providers extends JModelList
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// [10575] Get Yesterdays date
+				// [10576] Get Yesterdays date
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// [10577] reset query
+				// [10578] reset query
 				$query = $db->getQuery(true);
 
-				// [10579] Fields to update.
+				// [10580] Fields to update.
 				$fields = array(
 					$db->quoteName('checked_out_time') . '=\'0000-00-00 00:00:00\'',
 					$db->quoteName('checked_out') . '=0'
 				);
 
-				// [10584] Conditions for which records should be updated.
+				// [10585] Conditions for which records should be updated.
 				$conditions = array(
 					$db->quoteName('checked_out') . '!=0', 
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);
 
-				// [10589] Check table
+				// [10590] Check table
 				$query->update($db->quoteName('#__costbenefitprojection_service_provider'))->set($fields)->where($conditions); 
 
 				$db->setQuery($query);
diff --git a/admin/tables/causerisk.php b/admin/tables/causerisk.php
index f324c025..c9915429 100644
--- a/admin/tables/causerisk.php
+++ b/admin/tables/causerisk.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -47,7 +47,7 @@ class CostbenefitprojectionTableCauserisk extends JTable
 	{
 		parent::__construct('#__costbenefitprojection_causerisk', 'id', $db);
 
-		// [4202] Adding History Options
+		// [4203] Adding History Options
 		JTableObserverContenthistory::createObserver($this, array('typeAlias' => 'com_costbenefitprojection.causerisk')); 
 	}	
  
diff --git a/admin/tables/company.php b/admin/tables/company.php
index e6a502c8..c0b602fb 100644
--- a/admin/tables/company.php
+++ b/admin/tables/company.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -47,7 +47,7 @@ class CostbenefitprojectionTableCompany extends JTable
 	{
 		parent::__construct('#__costbenefitprojection_company', 'id', $db);
 
-		// [4202] Adding History Options
+		// [4203] Adding History Options
 		JTableObserverContenthistory::createObserver($this, array('typeAlias' => 'com_costbenefitprojection.company')); 
 	}	
  
diff --git a/admin/tables/country.php b/admin/tables/country.php
index 7b0c4d5c..bbbf988d 100644
--- a/admin/tables/country.php
+++ b/admin/tables/country.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -47,7 +47,7 @@ class CostbenefitprojectionTableCountry extends JTable
 	{
 		parent::__construct('#__costbenefitprojection_country', 'id', $db);
 
-		// [4202] Adding History Options
+		// [4203] Adding History Options
 		JTableObserverContenthistory::createObserver($this, array('typeAlias' => 'com_costbenefitprojection.country')); 
 	}	
  
diff --git a/admin/tables/currency.php b/admin/tables/currency.php
index 0da313ff..fbed15fa 100644
--- a/admin/tables/currency.php
+++ b/admin/tables/currency.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -47,7 +47,7 @@ class CostbenefitprojectionTableCurrency extends JTable
 	{
 		parent::__construct('#__costbenefitprojection_currency', 'id', $db);
 
-		// [4202] Adding History Options
+		// [4203] Adding History Options
 		JTableObserverContenthistory::createObserver($this, array('typeAlias' => 'com_costbenefitprojection.currency')); 
 	}	
  
diff --git a/admin/tables/health_data.php b/admin/tables/health_data.php
index fb21bf3d..b515f40c 100644
--- a/admin/tables/health_data.php
+++ b/admin/tables/health_data.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -47,7 +47,7 @@ class CostbenefitprojectionTableHealth_data extends JTable
 	{
 		parent::__construct('#__costbenefitprojection_health_data', 'id', $db);
 
-		// [4202] Adding History Options
+		// [4203] Adding History Options
 		JTableObserverContenthistory::createObserver($this, array('typeAlias' => 'com_costbenefitprojection.health_data')); 
 	}	
  
diff --git a/admin/tables/help_document.php b/admin/tables/help_document.php
index 8331e27b..dcee1df1 100644
--- a/admin/tables/help_document.php
+++ b/admin/tables/help_document.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -47,7 +47,7 @@ class CostbenefitprojectionTableHelp_document extends JTable
 	{
 		parent::__construct('#__costbenefitprojection_help_document', 'id', $db);
 
-		// [4202] Adding History Options
+		// [4203] Adding History Options
 		JTableObserverContenthistory::createObserver($this, array('typeAlias' => 'com_costbenefitprojection.help_document')); 
 	}	
  
diff --git a/admin/tables/intervention.php b/admin/tables/intervention.php
index 35c1b4b4..5780395d 100644
--- a/admin/tables/intervention.php
+++ b/admin/tables/intervention.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -47,7 +47,7 @@ class CostbenefitprojectionTableIntervention extends JTable
 	{
 		parent::__construct('#__costbenefitprojection_intervention', 'id', $db);
 
-		// [4202] Adding History Options
+		// [4203] Adding History Options
 		JTableObserverContenthistory::createObserver($this, array('typeAlias' => 'com_costbenefitprojection.intervention')); 
 	}	
  
diff --git a/admin/tables/scaling_factor.php b/admin/tables/scaling_factor.php
index 9ac38e85..6597c33a 100644
--- a/admin/tables/scaling_factor.php
+++ b/admin/tables/scaling_factor.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -47,7 +47,7 @@ class CostbenefitprojectionTableScaling_factor extends JTable
 	{
 		parent::__construct('#__costbenefitprojection_scaling_factor', 'id', $db);
 
-		// [4202] Adding History Options
+		// [4203] Adding History Options
 		JTableObserverContenthistory::createObserver($this, array('typeAlias' => 'com_costbenefitprojection.scaling_factor')); 
 	}	
  
diff --git a/admin/tables/service_provider.php b/admin/tables/service_provider.php
index bc17fc45..5da05d2d 100644
--- a/admin/tables/service_provider.php
+++ b/admin/tables/service_provider.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -47,7 +47,7 @@ class CostbenefitprojectionTableService_provider extends JTable
 	{
 		parent::__construct('#__costbenefitprojection_service_provider', 'id', $db);
 
-		// [4202] Adding History Options
+		// [4203] Adding History Options
 		JTableObserverContenthistory::createObserver($this, array('typeAlias' => 'com_costbenefitprojection.service_provider')); 
 	}	
  
diff --git a/admin/views/causerisk/submitbutton.js b/admin/views/causerisk/submitbutton.js
index 6e0505fa..106cade7 100644
--- a/admin/views/causerisk/submitbutton.js
+++ b/admin/views/causerisk/submitbutton.js
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/causerisk/tmpl/edit.php b/admin/views/causerisk/tmpl/edit.php
index 18727ebb..07dfba6c 100644
--- a/admin/views/causerisk/tmpl/edit.php
+++ b/admin/views/causerisk/tmpl/edit.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/causerisk/view.html.php b/admin/views/causerisk/view.html.php
index b451da17..83552bbb 100644
--- a/admin/views/causerisk/view.html.php
+++ b/admin/views/causerisk/view.html.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -86,27 +86,27 @@ class CostbenefitprojectionViewCauserisk extends JViewLegacy
 		$isNew = $this->item->id == 0;
 
 		JToolbarHelper::title( JText::_($isNew ? 'COM_COSTBENEFITPROJECTION_CAUSERISK_NEW' : 'COM_COSTBENEFITPROJECTION_CAUSERISK_EDIT'), 'pencil-2 article-add');
-		// [10277] Built the actions for new and existing records.
+		// [10278] Built the actions for new and existing records.
 		if ($this->refid || $this->ref)
 		{
 			if ($this->canDo->get('causerisk.create') && $isNew)
 			{
-				// [10289] We can create the record.
+				// [10290] We can create the record.
 				JToolBarHelper::save('causerisk.save', 'JTOOLBAR_SAVE');
 			}
 			elseif ($this->canDo->get('causerisk.edit'))
 			{
-				// [10301] We can save the record.
+				// [10302] We can save the record.
 				JToolBarHelper::save('causerisk.save', 'JTOOLBAR_SAVE');
 			}
 			if ($isNew)
 			{
-				// [10306] Do not creat but cancel.
+				// [10307] Do not creat but cancel.
 				JToolBarHelper::cancel('causerisk.cancel', 'JTOOLBAR_CANCEL');
 			}
 			else
 			{
-				// [10311] We can close it.
+				// [10312] We can close it.
 				JToolBarHelper::cancel('causerisk.cancel', 'JTOOLBAR_CLOSE');
 			}
 		}
@@ -114,7 +114,7 @@ class CostbenefitprojectionViewCauserisk extends JViewLegacy
 		{
 			if ($isNew)
 			{
-				// [10319] For new records, check the create permission.
+				// [10320] For new records, check the create permission.
 				if ($this->canDo->get('causerisk.create'))
 				{
 					JToolBarHelper::apply('causerisk.apply', 'JTOOLBAR_APPLY');
@@ -127,11 +127,11 @@ class CostbenefitprojectionViewCauserisk extends JViewLegacy
 			{
 				if ($this->canDo->get('causerisk.edit'))
 				{
-					// [10346] We can save the new record
+					// [10347] We can save the new record
 					JToolBarHelper::apply('causerisk.apply', 'JTOOLBAR_APPLY');
 					JToolBarHelper::save('causerisk.save', 'JTOOLBAR_SAVE');
-					// [10349] We can save this record, but check the create permission to see
-					// [10350] if we can return to make a new one.
+					// [10350] We can save this record, but check the create permission to see
+					// [10351] if we can return to make a new one.
 					if ($this->canDo->get('causerisk.create'))
 					{
 						JToolBarHelper::custom('causerisk.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
@@ -150,7 +150,7 @@ class CostbenefitprojectionViewCauserisk extends JViewLegacy
 			}
 		}
 		JToolbarHelper::divider();
-		// [10386] set help url for this view if found
+		// [10387] set help url for this view if found
 		$help_url = CostbenefitprojectionHelper::getHelpUrl('causerisk');
 		if (CostbenefitprojectionHelper::checkString($help_url))
 		{
diff --git a/admin/views/causesrisks/tmpl/default.php b/admin/views/causesrisks/tmpl/default.php
index ad4194f5..3c9ccc51 100644
--- a/admin/views/causesrisks/tmpl/default.php
+++ b/admin/views/causesrisks/tmpl/default.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/causesrisks/tmpl/default_batch_body.php b/admin/views/causesrisks/tmpl/default_batch_body.php
index ff9ab3fd..6cc0ee84 100644
--- a/admin/views/causesrisks/tmpl/default_batch_body.php
+++ b/admin/views/causesrisks/tmpl/default_batch_body.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/causesrisks/tmpl/default_batch_footer.php b/admin/views/causesrisks/tmpl/default_batch_footer.php
index b5284dab..999e573f 100644
--- a/admin/views/causesrisks/tmpl/default_batch_footer.php
+++ b/admin/views/causesrisks/tmpl/default_batch_footer.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/causesrisks/tmpl/default_body.php b/admin/views/causesrisks/tmpl/default_body.php
index b98e7e2e..6bb2a964 100644
--- a/admin/views/causesrisks/tmpl/default_body.php
+++ b/admin/views/causesrisks/tmpl/default_body.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/causesrisks/tmpl/default_foot.php b/admin/views/causesrisks/tmpl/default_foot.php
index c72afba9..e0daccb9 100644
--- a/admin/views/causesrisks/tmpl/default_foot.php
+++ b/admin/views/causesrisks/tmpl/default_foot.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/causesrisks/tmpl/default_head.php b/admin/views/causesrisks/tmpl/default_head.php
index 90c0c67e..2e5d6e6f 100644
--- a/admin/views/causesrisks/tmpl/default_head.php
+++ b/admin/views/causesrisks/tmpl/default_head.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/causesrisks/tmpl/default_toolbar.php b/admin/views/causesrisks/tmpl/default_toolbar.php
index 9a7d9c9e..fb0c7410 100644
--- a/admin/views/causesrisks/tmpl/default_toolbar.php
+++ b/admin/views/causesrisks/tmpl/default_toolbar.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/causesrisks/view.html.php b/admin/views/causesrisks/view.html.php
index ba8ec948..8f008d8e 100644
--- a/admin/views/causesrisks/view.html.php
+++ b/admin/views/causesrisks/view.html.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/combinedresults/tmpl/default.php b/admin/views/combinedresults/tmpl/default.php
index 2190b6fa..96e36e21 100644
--- a/admin/views/combinedresults/tmpl/default.php
+++ b/admin/views/combinedresults/tmpl/default.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/combinedresults/tmpl/default_chart_cost.php b/admin/views/combinedresults/tmpl/default_chart_cost.php
index 2ba8537a..0e7454e6 100644
--- a/admin/views/combinedresults/tmpl/default_chart_cost.php
+++ b/admin/views/combinedresults/tmpl/default_chart_cost.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/combinedresults/tmpl/default_chart_cost_percent.php b/admin/views/combinedresults/tmpl/default_chart_cost_percent.php
index 8e858677..a6039e5c 100644
--- a/admin/views/combinedresults/tmpl/default_chart_cost_percent.php
+++ b/admin/views/combinedresults/tmpl/default_chart_cost_percent.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php b/admin/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php
index b2d4cf9d..c9fce56f 100644
--- a/admin/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php
+++ b/admin/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/combinedresults/tmpl/default_chart_work_days_lost.php b/admin/views/combinedresults/tmpl/default_chart_work_days_lost.php
index eb43538f..312ea4e4 100644
--- a/admin/views/combinedresults/tmpl/default_chart_work_days_lost.php
+++ b/admin/views/combinedresults/tmpl/default_chart_work_days_lost.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php b/admin/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php
index 7c513556..ee9c4842 100644
--- a/admin/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php
+++ b/admin/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/combinedresults/tmpl/default_main.php b/admin/views/combinedresults/tmpl/default_main.php
index e934c780..756003ee 100644
--- a/admin/views/combinedresults/tmpl/default_main.php
+++ b/admin/views/combinedresults/tmpl/default_main.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php b/admin/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php
index 286cfba7..91fec09e 100644
--- a/admin/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php
+++ b/admin/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/combinedresults/tmpl/default_table_cost_summary.php b/admin/views/combinedresults/tmpl/default_table_cost_summary.php
index b41f8334..cd345a9d 100644
--- a/admin/views/combinedresults/tmpl/default_table_cost_summary.php
+++ b/admin/views/combinedresults/tmpl/default_table_cost_summary.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/combinedresults/tmpl/default_table_intervention_net_benefit.php b/admin/views/combinedresults/tmpl/default_table_intervention_net_benefit.php
index 9ad0c417..826734e6 100644
--- a/admin/views/combinedresults/tmpl/default_table_intervention_net_benefit.php
+++ b/admin/views/combinedresults/tmpl/default_table_intervention_net_benefit.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/combinedresults/tmpl/default_table_work_days_lost_summary.php b/admin/views/combinedresults/tmpl/default_table_work_days_lost_summary.php
index 717fcf1a..961af8f2 100644
--- a/admin/views/combinedresults/tmpl/default_table_work_days_lost_summary.php
+++ b/admin/views/combinedresults/tmpl/default_table_work_days_lost_summary.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/combinedresults/view.html.php b/admin/views/combinedresults/view.html.php
index b57d8a0f..8fa3c598 100644
--- a/admin/views/combinedresults/view.html.php
+++ b/admin/views/combinedresults/view.html.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -37,10 +37,10 @@ class CostbenefitprojectionViewCombinedresults extends JViewLegacy
 		$this->user = JFactory::getUser();
                 // get global action permissions
 		$this->canDo = CostbenefitprojectionHelper::getActions('combinedresults');
-		// [3043] Initialise variables.
+		// [3044] Initialise variables.
 		$this->items		= $this->get('Items');
 
-		// [3061] Check for errors.
+		// [3062] Check for errors.
 		if (count($errors = $this->get('Errors')))
 		{
 			JError::raiseWarning(500, implode("\n", $errors));
@@ -72,14 +72,14 @@ class CostbenefitprojectionViewCombinedresults extends JViewLegacy
 			$this->table_tabs = false;
 		}
 
-		// [3085] We don't need toolbar in the modal window.
+		// [3086] We don't need toolbar in the modal window.
 		if ($this->getLayout() !== 'modal')
 		{
-			// [3088] add the tool bar
+			// [3089] add the tool bar
 			$this->addToolBar();
 		}
 
-		// [3091] set the document
+		// [3092] set the document
 		$this->setDocument();
 
 		parent::display($tpl);
@@ -128,80 +128,80 @@ class CostbenefitprojectionViewCombinedresults extends JViewLegacy
 	protected function setDocument()
 	{
 
-		// [3430] always make sure jquery is loaded.
+		// [3431] always make sure jquery is loaded.
 		JHtml::_('jquery.framework');
-		// [3432] Load the header checker class.
+		// [3433] Load the header checker class.
 		require_once( JPATH_COMPONENT_SITE.'/helpers/headercheck.php' );
-		// [3434] Initialize the header checker.
+		// [3435] Initialize the header checker.
 		$HeaderCheck = new HeaderCheck;
 
-		// [3439] Load uikit options.
+		// [3440] Load uikit options.
 		$uikit = $this->params->get('uikit_load');
-		// [3441] Set script size.
+		// [3442] Set script size.
 		$size = $this->params->get('uikit_min');
-		// [3443] Set css style.
+		// [3444] Set css style.
 		$style = $this->params->get('uikit_style');
 
-		// [3446] The uikit css.
+		// [3447] The uikit css.
 		if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3)
 		{
 			$this->document->addStyleSheet(JURI::root(true) .'/media/com_costbenefitprojection/uikit/css/uikit'.$style.$size.'.css');
 		}
-		// [3451] The uikit js.
+		// [3452] The uikit js.
 		if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3)
 		{
 			$this->document->addScript(JURI::root(true) .'/media/com_costbenefitprojection/uikit/js/uikit'.$size.'.js');
 		}
 
-		// [3516] Load the needed uikit components in this view.
+		// [3517] Load the needed uikit components in this view.
 		$uikitComp = $this->get('UikitComp');
 		if ($uikit != 2 && isset($uikitComp) && CostbenefitprojectionHelper::checkArray($uikitComp))
 		{
-			// [3520] load just in case.
+			// [3521] load just in case.
 			jimport('joomla.filesystem.file');
-			// [3522] loading...
+			// [3523] loading...
 			foreach ($uikitComp as $class)
 			{
 				foreach (CostbenefitprojectionHelper::$uk_components[$class] as $name)
 				{
-					// [3527] check if the CSS file exists.
+					// [3528] check if the CSS file exists.
 					if (JFile::exists(JPATH_ROOT.'/media/com_costbenefitprojection/uikit/css/components/'.$name.$style.$size.'.css'))
 					{
-						// [3530] load the css.
+						// [3531] load the css.
 						$this->document->addStyleSheet(JURI::root(true) .'/media/com_costbenefitprojection/uikit/css/components/'.$name.$style.$size.'.css');
 					}
-					// [3533] check if the JavaScript file exists.
+					// [3534] check if the JavaScript file exists.
 					if (JFile::exists(JPATH_ROOT.'/media/com_costbenefitprojection/uikit/js/components/'.$name.$size.'.js'))
 					{
-						// [3536] load the js.
+						// [3537] load the js.
 						$this->document->addScript(JURI::root(true) .'/media/com_costbenefitprojection/uikit/js/components/'.$name.$size.'.js');
 					}
 				}
 			}
 		} 
 
-		// [3412] add the google chart builder class.
+		// [3413] add the google chart builder class.
 		require_once JPATH_COMPONENT_ADMINISTRATOR.'/helpers/chartbuilder.php';
-		// [3414] load the google chart js.
+		// [3415] load the google chart js.
 		$this->document->addScript(JURI::root(true) .'/media/com_costbenefitprojection/js/google.jsapi.js');
 		$this->document->addScript('https://canvg.googlecode.com/svn/trunk/rgbcolor.js');
 		$this->document->addScript('https://canvg.googlecode.com/svn/trunk/canvg.js'); 
 
-		// [6522] Add the CSS for Footable.
+		// [6523] Add the CSS for Footable.
 		$this->document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable/css/footable.core.min.css');
 
-		// [6524] Use the Metro Style
+		// [6525] Use the Metro Style
 		if (!isset($this->fooTableStyle) || 0 == $this->fooTableStyle)
 		{
 			$this->document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable/css/footable.metro.min.css');
 		}
-		// [6529] Use the Legacy Style.
+		// [6530] Use the Legacy Style.
 		elseif (isset($this->fooTableStyle) && 1 == $this->fooTableStyle)
 		{
 			$this->document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable/css/footable.standalone.min.css');
 		}
 
-		// [6534] Add the JavaScript for Footable
+		// [6535] Add the JavaScript for Footable
 		$this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable/js/footable.js');
 		$this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable/js/footable.sort.js');
 		$this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable/js/footable.filter.js');
@@ -251,7 +251,7 @@ class CostbenefitprojectionViewCombinedresults extends JViewLegacy
 		JToolBarHelper::custom('combinedresults.dashboard', 'grid-2', '', 'COM_COSTBENEFITPROJECTION_DASH', false);
 		if ($this->canDo->get('combinedresults.companies'))
 		{
-			// [3211] add Companies button.
+			// [3212] add Companies button.
 			JToolBarHelper::custom('combinedresults.gotoCompanies', 'vcard', '', 'COM_COSTBENEFITPROJECTION_COMPANIES', false);
 		}
 
diff --git a/admin/views/companies/tmpl/default.php b/admin/views/companies/tmpl/default.php
index 6b7ec3df..4258df43 100644
--- a/admin/views/companies/tmpl/default.php
+++ b/admin/views/companies/tmpl/default.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/companies/tmpl/default_batch_body.php b/admin/views/companies/tmpl/default_batch_body.php
index 2c607aa5..6c569bde 100644
--- a/admin/views/companies/tmpl/default_batch_body.php
+++ b/admin/views/companies/tmpl/default_batch_body.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/companies/tmpl/default_batch_footer.php b/admin/views/companies/tmpl/default_batch_footer.php
index 064baeb1..50c8969f 100644
--- a/admin/views/companies/tmpl/default_batch_footer.php
+++ b/admin/views/companies/tmpl/default_batch_footer.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/companies/tmpl/default_body.php b/admin/views/companies/tmpl/default_body.php
index c7afc6e1..1df1b699 100644
--- a/admin/views/companies/tmpl/default_body.php
+++ b/admin/views/companies/tmpl/default_body.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/companies/tmpl/default_foot.php b/admin/views/companies/tmpl/default_foot.php
index a586c5df..7f7a9426 100644
--- a/admin/views/companies/tmpl/default_foot.php
+++ b/admin/views/companies/tmpl/default_foot.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/companies/tmpl/default_head.php b/admin/views/companies/tmpl/default_head.php
index aedac456..7408fd34 100644
--- a/admin/views/companies/tmpl/default_head.php
+++ b/admin/views/companies/tmpl/default_head.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/companies/tmpl/default_toolbar.php b/admin/views/companies/tmpl/default_toolbar.php
index e69939ed..20b10cc1 100644
--- a/admin/views/companies/tmpl/default_toolbar.php
+++ b/admin/views/companies/tmpl/default_toolbar.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/companies/view.html.php b/admin/views/companies/view.html.php
index 056b8aea..774e5252 100644
--- a/admin/views/companies/view.html.php
+++ b/admin/views/companies/view.html.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -130,7 +130,7 @@ class CostbenefitprojectionViewCompanies extends JViewLegacy
                                 $bar->appendButton('Custom', $dhtml, 'batch');
                         }		if ($this->canDo->get('combinedresults.access'))
 		{
-			// [7126] add Combined Results button.
+			// [7127] add Combined Results button.
 			JToolBarHelper::custom('companies.redirectToCombinedresults', 'cogs', '', 'COM_COSTBENEFITPROJECTION_COMBINEDRESULTS', true);
 		} 
 
@@ -200,11 +200,11 @@ class CostbenefitprojectionViewCompanies extends JViewLegacy
 			);
                 }  
 
-		// [9149] Set Department Selection
+		// [9150] Set Department Selection
 		$this->departmentOptions = $this->getTheDepartmentSelections();
 		if ($this->departmentOptions)
 		{
-			// [9153] Department Filter
+			// [9154] Department Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COSTBENEFITPROJECTION_COMPANY_DEPARTMENT_LABEL').' -',
 				'filter_department',
@@ -213,7 +213,7 @@ class CostbenefitprojectionViewCompanies extends JViewLegacy
 
 			if ($this->canBatch && $this->canCreate && $this->canEdit)
 			{
-				// [9162] Department Batch Selection
+				// [9163] Department Batch Selection
 				JHtmlBatch_::addListSelection(
 					'- Keep Original '.JText::_('COM_COSTBENEFITPROJECTION_COMPANY_DEPARTMENT_LABEL').' -',
 					'batch[department]',
@@ -222,11 +222,11 @@ class CostbenefitprojectionViewCompanies extends JViewLegacy
 			}
 		}
 
-		// [9115] Set Country Name Selection
+		// [9116] Set Country Name Selection
 		$this->countryNameOptions = JFormHelper::loadFieldType('Countries')->getOptions();
 		if ($this->countryNameOptions)
 		{
-			// [9119] Country Name Filter
+			// [9120] Country Name Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COSTBENEFITPROJECTION_COMPANY_COUNTRY_LABEL').' -',
 				'filter_country',
@@ -235,7 +235,7 @@ class CostbenefitprojectionViewCompanies extends JViewLegacy
 
 			if ($this->canBatch && $this->canCreate && $this->canEdit)
 			{
-				// [9128] Country Name Batch Selection
+				// [9129] Country Name Batch Selection
 				JHtmlBatch_::addListSelection(
 					'- Keep Original '.JText::_('COM_COSTBENEFITPROJECTION_COMPANY_COUNTRY_LABEL').' -',
 					'batch[country]',
@@ -244,11 +244,11 @@ class CostbenefitprojectionViewCompanies extends JViewLegacy
 			}
 		}
 
-		// [9115] Set Serviceprovider User Selection
+		// [9116] Set Serviceprovider User Selection
 		$this->serviceproviderUserOptions = JFormHelper::loadFieldType('Serviceprovider')->getOptions();
 		if ($this->serviceproviderUserOptions)
 		{
-			// [9119] Serviceprovider User Filter
+			// [9120] Serviceprovider User Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COSTBENEFITPROJECTION_COMPANY_SERVICEPROVIDER_LABEL').' -',
 				'filter_serviceprovider',
@@ -257,7 +257,7 @@ class CostbenefitprojectionViewCompanies extends JViewLegacy
 
 			if ($this->canBatch && $this->canCreate && $this->canEdit)
 			{
-				// [9128] Serviceprovider User Batch Selection
+				// [9129] Serviceprovider User Batch Selection
 				JHtmlBatch_::addListSelection(
 					'- Keep Original '.JText::_('COM_COSTBENEFITPROJECTION_COMPANY_SERVICEPROVIDER_LABEL').' -',
 					'batch[serviceprovider]',
@@ -266,11 +266,11 @@ class CostbenefitprojectionViewCompanies extends JViewLegacy
 			}
 		}
 
-		// [9149] Set Per Selection
+		// [9150] Set Per Selection
 		$this->perOptions = $this->getThePerSelections();
 		if ($this->perOptions)
 		{
-			// [9153] Per Filter
+			// [9154] Per Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COSTBENEFITPROJECTION_COMPANY_PER_LABEL').' -',
 				'filter_per',
@@ -279,7 +279,7 @@ class CostbenefitprojectionViewCompanies extends JViewLegacy
 
 			if ($this->canBatch && $this->canCreate && $this->canEdit)
 			{
-				// [9162] Per Batch Selection
+				// [9163] Per Batch Selection
 				JHtmlBatch_::addListSelection(
 					'- Keep Original '.JText::_('COM_COSTBENEFITPROJECTION_COMPANY_PER_LABEL').' -',
 					'batch[per]',
@@ -341,33 +341,33 @@ class CostbenefitprojectionViewCompanies extends JViewLegacy
 
 	protected function getTheDepartmentSelections()
 	{
-		// [9025] Get a db connection.
+		// [9026] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [9027] Create a new query object.
+		// [9028] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [9029] Select the text.
+		// [9030] Select the text.
 		$query->select($db->quoteName('department'));
 		$query->from($db->quoteName('#__costbenefitprojection_company'));
 		$query->order($db->quoteName('department') . ' ASC');
 
-		// [9033] Reset the query using our newly populated query object.
+		// [9034] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
 		$results = $db->loadColumn();
 
 		if ($results)
 		{
-			// [9041] get model
+			// [9042] get model
 			$model = $this->getModel();
 			$results = array_unique($results);
 			$filter = array();
 			foreach ($results as $department)
 			{
-				// [9052] Translate the department selection
+				// [9053] Translate the department selection
 				$text = $model->selectionTranslation($department,'department');
-				// [9054] Now add the department and its text to the options array
+				// [9055] Now add the department and its text to the options array
 				$filter[] = JHtml::_('select.option', $department, JText::_($text));
 			}
 			return $filter;
@@ -377,33 +377,33 @@ class CostbenefitprojectionViewCompanies extends JViewLegacy
 
 	protected function getThePerSelections()
 	{
-		// [9025] Get a db connection.
+		// [9026] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [9027] Create a new query object.
+		// [9028] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [9029] Select the text.
+		// [9030] Select the text.
 		$query->select($db->quoteName('per'));
 		$query->from($db->quoteName('#__costbenefitprojection_company'));
 		$query->order($db->quoteName('per') . ' ASC');
 
-		// [9033] Reset the query using our newly populated query object.
+		// [9034] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
 		$results = $db->loadColumn();
 
 		if ($results)
 		{
-			// [9041] get model
+			// [9042] get model
 			$model = $this->getModel();
 			$results = array_unique($results);
 			$filter = array();
 			foreach ($results as $per)
 			{
-				// [9052] Translate the per selection
+				// [9053] Translate the per selection
 				$text = $model->selectionTranslation($per,'per');
-				// [9054] Now add the per and its text to the options array
+				// [9055] Now add the per and its text to the options array
 				$filter[] = JHtml::_('select.option', $per, JText::_($text));
 			}
 			return $filter;
diff --git a/admin/views/company/submitbutton.js b/admin/views/company/submitbutton.js
index 1503d933..5cc027b0 100644
--- a/admin/views/company/submitbutton.js
+++ b/admin/views/company/submitbutton.js
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/company/tmpl/edit.php b/admin/views/company/tmpl/edit.php
index df73e56f..dc0cc9a0 100644
--- a/admin/views/company/tmpl/edit.php
+++ b/admin/views/company/tmpl/edit.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -135,33 +135,33 @@ $componentParams = JComponentHelper::getParams('com_costbenefitprojection');
 
 <script type="text/javascript">
 
-// #jform_department listeners for department_MyenDgD function
+// #jform_department listeners for department_pydRZWr function
 jQuery('#jform_department').on('keyup',function()
 {
-	var department_MyenDgD = jQuery("#jform_department input[type='radio']:checked").val();
-	MyenDgD(department_MyenDgD);
+	var department_pydRZWr = jQuery("#jform_department input[type='radio']:checked").val();
+	pydRZWr(department_pydRZWr);
 
 });
 jQuery('#adminForm').on('change', '#jform_department',function (e)
 {
 	e.preventDefault();
-	var department_MyenDgD = jQuery("#jform_department input[type='radio']:checked").val();
-	MyenDgD(department_MyenDgD);
+	var department_pydRZWr = jQuery("#jform_department input[type='radio']:checked").val();
+	pydRZWr(department_pydRZWr);
 
 });
 
-// #jform_department listeners for department_JKkommy function
+// #jform_department listeners for department_sAKFZSC function
 jQuery('#jform_department').on('keyup',function()
 {
-	var department_JKkommy = jQuery("#jform_department input[type='radio']:checked").val();
-	JKkommy(department_JKkommy);
+	var department_sAKFZSC = jQuery("#jform_department input[type='radio']:checked").val();
+	sAKFZSC(department_sAKFZSC);
 
 });
 jQuery('#adminForm').on('change', '#jform_department',function (e)
 {
 	e.preventDefault();
-	var department_JKkommy = jQuery("#jform_department input[type='radio']:checked").val();
-	JKkommy(department_JKkommy);
+	var department_sAKFZSC = jQuery("#jform_department input[type='radio']:checked").val();
+	sAKFZSC(department_sAKFZSC);
 
 });
 
diff --git a/admin/views/company/view.html.php b/admin/views/company/view.html.php
index 70128ddd..d43c70b9 100644
--- a/admin/views/company/view.html.php
+++ b/admin/views/company/view.html.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -64,11 +64,11 @@ class CostbenefitprojectionViewCompany extends JViewLegacy
                         $this->referral = '&ref='.(string)$this->ref;
                 }
 
-		// [6487] Get Linked view data
-		$this->oabscaling_factors		= $this->get('Oabscaling_factors');
+		// [6488] Get Linked view data
+		$this->yosscaling_factors		= $this->get('Yosscaling_factors');
 
-		// [6487] Get Linked view data
-		$this->ljeinterventions		= $this->get('Ljeinterventions');
+		// [6488] Get Linked view data
+		$this->zjtinterventions		= $this->get('Zjtinterventions');
 
 		// Set the toolbar
 		$this->addToolBar();
@@ -92,27 +92,27 @@ class CostbenefitprojectionViewCompany extends JViewLegacy
 		$isNew = $this->item->id == 0;
 
 		JToolbarHelper::title( JText::_($isNew ? 'COM_COSTBENEFITPROJECTION_COMPANY_NEW' : 'COM_COSTBENEFITPROJECTION_COMPANY_EDIT'), 'pencil-2 article-add');
-		// [10277] Built the actions for new and existing records.
+		// [10278] Built the actions for new and existing records.
 		if ($this->refid || $this->ref)
 		{
 			if ($this->canDo->get('company.create') && $isNew)
 			{
-				// [10289] We can create the record.
+				// [10290] We can create the record.
 				JToolBarHelper::save('company.save', 'JTOOLBAR_SAVE');
 			}
 			elseif ($this->canDo->get('company.edit'))
 			{
-				// [10301] We can save the record.
+				// [10302] We can save the record.
 				JToolBarHelper::save('company.save', 'JTOOLBAR_SAVE');
 			}
 			if ($isNew)
 			{
-				// [10306] Do not creat but cancel.
+				// [10307] Do not creat but cancel.
 				JToolBarHelper::cancel('company.cancel', 'JTOOLBAR_CANCEL');
 			}
 			else
 			{
-				// [10311] We can close it.
+				// [10312] We can close it.
 				JToolBarHelper::cancel('company.cancel', 'JTOOLBAR_CLOSE');
 			}
 		}
@@ -120,7 +120,7 @@ class CostbenefitprojectionViewCompany extends JViewLegacy
 		{
 			if ($isNew)
 			{
-				// [10319] For new records, check the create permission.
+				// [10320] For new records, check the create permission.
 				if ($this->canDo->get('company.create'))
 				{
 					JToolBarHelper::apply('company.apply', 'JTOOLBAR_APPLY');
@@ -133,11 +133,11 @@ class CostbenefitprojectionViewCompany extends JViewLegacy
 			{
 				if ($this->canDo->get('company.edit'))
 				{
-					// [10346] We can save the new record
+					// [10347] We can save the new record
 					JToolBarHelper::apply('company.apply', 'JTOOLBAR_APPLY');
 					JToolBarHelper::save('company.save', 'JTOOLBAR_SAVE');
-					// [10349] We can save this record, but check the create permission to see
-					// [10350] if we can return to make a new one.
+					// [10350] We can save this record, but check the create permission to see
+					// [10351] if we can return to make a new one.
 					if ($this->canDo->get('company.create'))
 					{
 						JToolBarHelper::custom('company.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
@@ -156,7 +156,7 @@ class CostbenefitprojectionViewCompany extends JViewLegacy
 			}
 		}
 		JToolbarHelper::divider();
-		// [10386] set help url for this view if found
+		// [10387] set help url for this view if found
 		$help_url = CostbenefitprojectionHelper::getHelpUrl('company');
 		if (CostbenefitprojectionHelper::checkString($help_url))
 		{
@@ -194,21 +194,21 @@ class CostbenefitprojectionViewCompany extends JViewLegacy
 		$document->setTitle(JText::_($isNew ? 'COM_COSTBENEFITPROJECTION_COMPANY_NEW' : 'COM_COSTBENEFITPROJECTION_COMPANY_EDIT'));
 		$document->addStyleSheet(JURI::root() . "administrator/components/com_costbenefitprojection/assets/css/company.css"); 
 
-		// [6522] Add the CSS for Footable.
+		// [6523] Add the CSS for Footable.
 		$document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable/css/footable.core.min.css');
 
-		// [6524] Use the Metro Style
+		// [6525] Use the Metro Style
 		if (!isset($this->fooTableStyle) || 0 == $this->fooTableStyle)
 		{
 			$document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable/css/footable.metro.min.css');
 		}
-		// [6529] Use the Legacy Style.
+		// [6530] Use the Legacy Style.
 		elseif (isset($this->fooTableStyle) && 1 == $this->fooTableStyle)
 		{
 			$document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable/css/footable.standalone.min.css');
 		}
 
-		// [6534] Add the JavaScript for Footable
+		// [6535] Add the JavaScript for Footable
 		$document->addScript(JURI::root() .'media/com_costbenefitprojection/footable/js/footable.js');
 		$document->addScript(JURI::root() .'media/com_costbenefitprojection/footable/js/footable.sort.js');
 		$document->addScript(JURI::root() .'media/com_costbenefitprojection/footable/js/footable.filter.js');
diff --git a/admin/views/companyresults/tmpl/default.php b/admin/views/companyresults/tmpl/default.php
index 3eb64da2..07c854a7 100644
--- a/admin/views/companyresults/tmpl/default.php
+++ b/admin/views/companyresults/tmpl/default.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/companyresults/tmpl/default_chart_cost.php b/admin/views/companyresults/tmpl/default_chart_cost.php
index 2ba8537a..0e7454e6 100644
--- a/admin/views/companyresults/tmpl/default_chart_cost.php
+++ b/admin/views/companyresults/tmpl/default_chart_cost.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/companyresults/tmpl/default_chart_cost_percent.php b/admin/views/companyresults/tmpl/default_chart_cost_percent.php
index 8e858677..a6039e5c 100644
--- a/admin/views/companyresults/tmpl/default_chart_cost_percent.php
+++ b/admin/views/companyresults/tmpl/default_chart_cost_percent.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php b/admin/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php
index b2d4cf9d..c9fce56f 100644
--- a/admin/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php
+++ b/admin/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/companyresults/tmpl/default_chart_work_days_lost.php b/admin/views/companyresults/tmpl/default_chart_work_days_lost.php
index eb43538f..312ea4e4 100644
--- a/admin/views/companyresults/tmpl/default_chart_work_days_lost.php
+++ b/admin/views/companyresults/tmpl/default_chart_work_days_lost.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/companyresults/tmpl/default_chart_work_days_lost_percent.php b/admin/views/companyresults/tmpl/default_chart_work_days_lost_percent.php
index 7c513556..ee9c4842 100644
--- a/admin/views/companyresults/tmpl/default_chart_work_days_lost_percent.php
+++ b/admin/views/companyresults/tmpl/default_chart_work_days_lost_percent.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/companyresults/tmpl/default_main.php b/admin/views/companyresults/tmpl/default_main.php
index e934c780..756003ee 100644
--- a/admin/views/companyresults/tmpl/default_main.php
+++ b/admin/views/companyresults/tmpl/default_main.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php b/admin/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php
index 286cfba7..91fec09e 100644
--- a/admin/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php
+++ b/admin/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/companyresults/tmpl/default_table_cost_summary.php b/admin/views/companyresults/tmpl/default_table_cost_summary.php
index b41f8334..cd345a9d 100644
--- a/admin/views/companyresults/tmpl/default_table_cost_summary.php
+++ b/admin/views/companyresults/tmpl/default_table_cost_summary.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/companyresults/tmpl/default_table_intervention_net_benefit.php b/admin/views/companyresults/tmpl/default_table_intervention_net_benefit.php
index 9ad0c417..826734e6 100644
--- a/admin/views/companyresults/tmpl/default_table_intervention_net_benefit.php
+++ b/admin/views/companyresults/tmpl/default_table_intervention_net_benefit.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/companyresults/tmpl/default_table_work_days_lost_summary.php b/admin/views/companyresults/tmpl/default_table_work_days_lost_summary.php
index 717fcf1a..961af8f2 100644
--- a/admin/views/companyresults/tmpl/default_table_work_days_lost_summary.php
+++ b/admin/views/companyresults/tmpl/default_table_work_days_lost_summary.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/companyresults/tmpl/default_variables.php b/admin/views/companyresults/tmpl/default_variables.php
index db7f3c58..e8a7b086 100644
--- a/admin/views/companyresults/tmpl/default_variables.php
+++ b/admin/views/companyresults/tmpl/default_variables.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/companyresults/view.html.php b/admin/views/companyresults/view.html.php
index 6bef7c6c..69d68423 100644
--- a/admin/views/companyresults/view.html.php
+++ b/admin/views/companyresults/view.html.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -37,10 +37,10 @@ class CostbenefitprojectionViewCompanyresults extends JViewLegacy
 		$this->user = JFactory::getUser();
                 // get global action permissions
 		$this->canDo = CostbenefitprojectionHelper::getActions('companyresults');
-		// [3037] Initialise variables.
+		// [3038] Initialise variables.
 		$this->item	= $this->get('Item');
 
-		// [3061] Check for errors.
+		// [3062] Check for errors.
 		if (count($errors = $this->get('Errors')))
 		{
 			JError::raiseWarning(500, implode("\n", $errors));
@@ -65,14 +65,14 @@ class CostbenefitprojectionViewCompanyresults extends JViewLegacy
 			$this->table_tabs = false;
 		}
 
-		// [3085] We don't need toolbar in the modal window.
+		// [3086] We don't need toolbar in the modal window.
 		if ($this->getLayout() !== 'modal')
 		{
-			// [3088] add the tool bar
+			// [3089] add the tool bar
 			$this->addToolBar();
 		}
 
-		// [3091] set the document
+		// [3092] set the document
 		$this->setDocument();
 
 		parent::display($tpl);
@@ -120,7 +120,7 @@ class CostbenefitprojectionViewCompanyresults extends JViewLegacy
 	 */
 	protected function setDocument()
 	{
-		// [3337] load the meta description
+		// [3338] load the meta description
 		if (isset($this->item->metadesc) && $this->item->metadesc)
 		{
 			$this->document->setDescription($this->item->metadesc);
@@ -129,7 +129,7 @@ class CostbenefitprojectionViewCompanyresults extends JViewLegacy
 		{
 			$this->document->setDescription($this->params->get('menu-meta_description'));
 		}
-		// [3346] load the key words if set
+		// [3347] load the key words if set
 		if (isset($this->item->metakey) && $this->item->metakey)
 		{
 			$this->document->setMetadata('keywords', $this->item->metakey);
@@ -138,7 +138,7 @@ class CostbenefitprojectionViewCompanyresults extends JViewLegacy
 		{
 			$this->document->setMetadata('keywords', $this->params->get('menu-meta_keywords'));
 		}
-		// [3355] check the robot params
+		// [3356] check the robot params
 		if (isset($this->item->robots) && $this->item->robots)
 		{
 			$this->document->setMetadata('robots', $this->item->robots);
@@ -147,12 +147,12 @@ class CostbenefitprojectionViewCompanyresults extends JViewLegacy
 		{
 			$this->document->setMetadata('robots', $this->params->get('robots'));
 		}
-		// [3364] check if autor is to be set
+		// [3365] check if autor is to be set
 		if (isset($this->item->created_by) && $this->params->get('MetaAuthor') == '1')
 		{
 			$this->document->setMetaData('author', $this->item->created_by);
 		}
-		// [3369] check if metadata is available
+		// [3370] check if metadata is available
 		if (isset($this->item->metadata) && $this->item->metadata)
 		{
 			$mdata = json_decode($this->item->metadata,true);
@@ -165,80 +165,80 @@ class CostbenefitprojectionViewCompanyresults extends JViewLegacy
 			}
 		} 
 
-		// [3430] always make sure jquery is loaded.
+		// [3431] always make sure jquery is loaded.
 		JHtml::_('jquery.framework');
-		// [3432] Load the header checker class.
+		// [3433] Load the header checker class.
 		require_once( JPATH_COMPONENT_SITE.'/helpers/headercheck.php' );
-		// [3434] Initialize the header checker.
+		// [3435] Initialize the header checker.
 		$HeaderCheck = new HeaderCheck;
 
-		// [3439] Load uikit options.
+		// [3440] Load uikit options.
 		$uikit = $this->params->get('uikit_load');
-		// [3441] Set script size.
+		// [3442] Set script size.
 		$size = $this->params->get('uikit_min');
-		// [3443] Set css style.
+		// [3444] Set css style.
 		$style = $this->params->get('uikit_style');
 
-		// [3446] The uikit css.
+		// [3447] The uikit css.
 		if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3)
 		{
 			$this->document->addStyleSheet(JURI::root(true) .'/media/com_costbenefitprojection/uikit/css/uikit'.$style.$size.'.css');
 		}
-		// [3451] The uikit js.
+		// [3452] The uikit js.
 		if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3)
 		{
 			$this->document->addScript(JURI::root(true) .'/media/com_costbenefitprojection/uikit/js/uikit'.$size.'.js');
 		}
 
-		// [3516] Load the needed uikit components in this view.
+		// [3517] Load the needed uikit components in this view.
 		$uikitComp = $this->get('UikitComp');
 		if ($uikit != 2 && isset($uikitComp) && CostbenefitprojectionHelper::checkArray($uikitComp))
 		{
-			// [3520] load just in case.
+			// [3521] load just in case.
 			jimport('joomla.filesystem.file');
-			// [3522] loading...
+			// [3523] loading...
 			foreach ($uikitComp as $class)
 			{
 				foreach (CostbenefitprojectionHelper::$uk_components[$class] as $name)
 				{
-					// [3527] check if the CSS file exists.
+					// [3528] check if the CSS file exists.
 					if (JFile::exists(JPATH_ROOT.'/media/com_costbenefitprojection/uikit/css/components/'.$name.$style.$size.'.css'))
 					{
-						// [3530] load the css.
+						// [3531] load the css.
 						$this->document->addStyleSheet(JURI::root(true) .'/media/com_costbenefitprojection/uikit/css/components/'.$name.$style.$size.'.css');
 					}
-					// [3533] check if the JavaScript file exists.
+					// [3534] check if the JavaScript file exists.
 					if (JFile::exists(JPATH_ROOT.'/media/com_costbenefitprojection/uikit/js/components/'.$name.$size.'.js'))
 					{
-						// [3536] load the js.
+						// [3537] load the js.
 						$this->document->addScript(JURI::root(true) .'/media/com_costbenefitprojection/uikit/js/components/'.$name.$size.'.js');
 					}
 				}
 			}
 		} 
 
-		// [3412] add the google chart builder class.
+		// [3413] add the google chart builder class.
 		require_once JPATH_COMPONENT_ADMINISTRATOR.'/helpers/chartbuilder.php';
-		// [3414] load the google chart js.
+		// [3415] load the google chart js.
 		$this->document->addScript(JURI::root(true) .'/media/com_costbenefitprojection/js/google.jsapi.js');
 		$this->document->addScript('https://canvg.googlecode.com/svn/trunk/rgbcolor.js');
 		$this->document->addScript('https://canvg.googlecode.com/svn/trunk/canvg.js'); 
 
-		// [6522] Add the CSS for Footable.
+		// [6523] Add the CSS for Footable.
 		$this->document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable/css/footable.core.min.css');
 
-		// [6524] Use the Metro Style
+		// [6525] Use the Metro Style
 		if (!isset($this->fooTableStyle) || 0 == $this->fooTableStyle)
 		{
 			$this->document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable/css/footable.metro.min.css');
 		}
-		// [6529] Use the Legacy Style.
+		// [6530] Use the Legacy Style.
 		elseif (isset($this->fooTableStyle) && 1 == $this->fooTableStyle)
 		{
 			$this->document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable/css/footable.standalone.min.css');
 		}
 
-		// [6534] Add the JavaScript for Footable
+		// [6535] Add the JavaScript for Footable
 		$this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable/js/footable.js');
 		$this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable/js/footable.sort.js');
 		$this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable/js/footable.filter.js');
@@ -296,12 +296,12 @@ class CostbenefitprojectionViewCompanyresults extends JViewLegacy
 		JToolBarHelper::custom('companyresults.dashboard', 'grid-2', '', 'COM_COSTBENEFITPROJECTION_DASH', false);
 		if ($this->canDo->get('companyresults.companies'))
 		{
-			// [3211] add Companies button.
+			// [3212] add Companies button.
 			JToolBarHelper::custom('companyresults.gotoCompanies', 'vcard', '', 'COM_COSTBENEFITPROJECTION_COMPANIES', false);
 		}
 		if ($this->canDo->get('companyresults.edit'))
 		{
-			// [3211] add Edit button.
+			// [3212] add Edit button.
 			JToolBarHelper::custom('companyresults.editCompany', 'pencil', '', 'COM_COSTBENEFITPROJECTION_EDIT', false);
 		}
 
diff --git a/admin/views/costbenefitprojection/tmpl/default.php b/admin/views/costbenefitprojection/tmpl/default.php
index d075c06c..372b7b78 100644
--- a/admin/views/costbenefitprojection/tmpl/default.php
+++ b/admin/views/costbenefitprojection/tmpl/default.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/costbenefitprojection/tmpl/default_main.php b/admin/views/costbenefitprojection/tmpl/default_main.php
index e6e28140..af6ea646 100644
--- a/admin/views/costbenefitprojection/tmpl/default_main.php
+++ b/admin/views/costbenefitprojection/tmpl/default_main.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/costbenefitprojection/tmpl/default_vdm.php b/admin/views/costbenefitprojection/tmpl/default_vdm.php
index d685b8b2..31d46f7f 100644
--- a/admin/views/costbenefitprojection/tmpl/default_vdm.php
+++ b/admin/views/costbenefitprojection/tmpl/default_vdm.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/costbenefitprojection/view.html.php b/admin/views/costbenefitprojection/view.html.php
index f2b8e2b2..7a82bd14 100644
--- a/admin/views/costbenefitprojection/view.html.php
+++ b/admin/views/costbenefitprojection/view.html.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/countries/tmpl/default.php b/admin/views/countries/tmpl/default.php
index d6f16ec9..7ef19ede 100644
--- a/admin/views/countries/tmpl/default.php
+++ b/admin/views/countries/tmpl/default.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/countries/tmpl/default_batch_body.php b/admin/views/countries/tmpl/default_batch_body.php
index 9131f5a2..c3a63a86 100644
--- a/admin/views/countries/tmpl/default_batch_body.php
+++ b/admin/views/countries/tmpl/default_batch_body.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/countries/tmpl/default_batch_footer.php b/admin/views/countries/tmpl/default_batch_footer.php
index b3ef11d7..aa43a6a1 100644
--- a/admin/views/countries/tmpl/default_batch_footer.php
+++ b/admin/views/countries/tmpl/default_batch_footer.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/countries/tmpl/default_body.php b/admin/views/countries/tmpl/default_body.php
index feeca6db..4677c725 100644
--- a/admin/views/countries/tmpl/default_body.php
+++ b/admin/views/countries/tmpl/default_body.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/countries/tmpl/default_foot.php b/admin/views/countries/tmpl/default_foot.php
index a586c5df..7f7a9426 100644
--- a/admin/views/countries/tmpl/default_foot.php
+++ b/admin/views/countries/tmpl/default_foot.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/countries/tmpl/default_head.php b/admin/views/countries/tmpl/default_head.php
index 343667cf..b3224b1d 100644
--- a/admin/views/countries/tmpl/default_head.php
+++ b/admin/views/countries/tmpl/default_head.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/countries/tmpl/default_toolbar.php b/admin/views/countries/tmpl/default_toolbar.php
index f27d0e41..52af678d 100644
--- a/admin/views/countries/tmpl/default_toolbar.php
+++ b/admin/views/countries/tmpl/default_toolbar.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/countries/view.html.php b/admin/views/countries/view.html.php
index b1094410..446399bf 100644
--- a/admin/views/countries/view.html.php
+++ b/admin/views/countries/view.html.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -196,11 +196,11 @@ class CostbenefitprojectionViewCountries extends JViewLegacy
 			);
                 }  
 
-		// [9115] Set Currency Name Selection
+		// [9116] Set Currency Name Selection
 		$this->currencyNameOptions = JFormHelper::loadFieldType('Currency')->getOptions();
 		if ($this->currencyNameOptions)
 		{
-			// [9119] Currency Name Filter
+			// [9120] Currency Name Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COSTBENEFITPROJECTION_COUNTRY_CURRENCY_LABEL').' -',
 				'filter_currency',
@@ -209,7 +209,7 @@ class CostbenefitprojectionViewCountries extends JViewLegacy
 
 			if ($this->canBatch && $this->canCreate && $this->canEdit)
 			{
-				// [9128] Currency Name Batch Selection
+				// [9129] Currency Name Batch Selection
 				JHtmlBatch_::addListSelection(
 					'- Keep Original '.JText::_('COM_COSTBENEFITPROJECTION_COUNTRY_CURRENCY_LABEL').' -',
 					'batch[currency]',
diff --git a/admin/views/country/submitbutton.js b/admin/views/country/submitbutton.js
index 2893e6e1..2284f892 100644
--- a/admin/views/country/submitbutton.js
+++ b/admin/views/country/submitbutton.js
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/country/tmpl/edit.php b/admin/views/country/tmpl/edit.php
index 916e6b2d..5b9d5cb0 100644
--- a/admin/views/country/tmpl/edit.php
+++ b/admin/views/country/tmpl/edit.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/country/view.html.php b/admin/views/country/view.html.php
index 64ec4e86..f004fd15 100644
--- a/admin/views/country/view.html.php
+++ b/admin/views/country/view.html.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -64,11 +64,11 @@ class CostbenefitprojectionViewCountry extends JViewLegacy
                         $this->referral = '&ref='.(string)$this->ref;
                 }
 
-		// [6487] Get Linked view data
-		$this->hhiservice_providers		= $this->get('Hhiservice_providers');
+		// [6488] Get Linked view data
+		$this->mqkservice_providers		= $this->get('Mqkservice_providers');
 
-		// [6487] Get Linked view data
-		$this->yqdcompanies		= $this->get('Yqdcompanies');
+		// [6488] Get Linked view data
+		$this->lqmcompanies		= $this->get('Lqmcompanies');
 
 		// Set the toolbar
 		$this->addToolBar();
@@ -92,27 +92,27 @@ class CostbenefitprojectionViewCountry extends JViewLegacy
 		$isNew = $this->item->id == 0;
 
 		JToolbarHelper::title( JText::_($isNew ? 'COM_COSTBENEFITPROJECTION_COUNTRY_NEW' : 'COM_COSTBENEFITPROJECTION_COUNTRY_EDIT'), 'pencil-2 article-add');
-		// [10277] Built the actions for new and existing records.
+		// [10278] Built the actions for new and existing records.
 		if ($this->refid || $this->ref)
 		{
 			if ($this->canDo->get('country.create') && $isNew)
 			{
-				// [10289] We can create the record.
+				// [10290] We can create the record.
 				JToolBarHelper::save('country.save', 'JTOOLBAR_SAVE');
 			}
 			elseif ($this->canDo->get('country.edit'))
 			{
-				// [10301] We can save the record.
+				// [10302] We can save the record.
 				JToolBarHelper::save('country.save', 'JTOOLBAR_SAVE');
 			}
 			if ($isNew)
 			{
-				// [10306] Do not creat but cancel.
+				// [10307] Do not creat but cancel.
 				JToolBarHelper::cancel('country.cancel', 'JTOOLBAR_CANCEL');
 			}
 			else
 			{
-				// [10311] We can close it.
+				// [10312] We can close it.
 				JToolBarHelper::cancel('country.cancel', 'JTOOLBAR_CLOSE');
 			}
 		}
@@ -120,7 +120,7 @@ class CostbenefitprojectionViewCountry extends JViewLegacy
 		{
 			if ($isNew)
 			{
-				// [10319] For new records, check the create permission.
+				// [10320] For new records, check the create permission.
 				if ($this->canDo->get('country.create'))
 				{
 					JToolBarHelper::apply('country.apply', 'JTOOLBAR_APPLY');
@@ -133,11 +133,11 @@ class CostbenefitprojectionViewCountry extends JViewLegacy
 			{
 				if ($this->canDo->get('country.edit'))
 				{
-					// [10346] We can save the new record
+					// [10347] We can save the new record
 					JToolBarHelper::apply('country.apply', 'JTOOLBAR_APPLY');
 					JToolBarHelper::save('country.save', 'JTOOLBAR_SAVE');
-					// [10349] We can save this record, but check the create permission to see
-					// [10350] if we can return to make a new one.
+					// [10350] We can save this record, but check the create permission to see
+					// [10351] if we can return to make a new one.
 					if ($this->canDo->get('country.create'))
 					{
 						JToolBarHelper::custom('country.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
@@ -156,7 +156,7 @@ class CostbenefitprojectionViewCountry extends JViewLegacy
 			}
 		}
 		JToolbarHelper::divider();
-		// [10386] set help url for this view if found
+		// [10387] set help url for this view if found
 		$help_url = CostbenefitprojectionHelper::getHelpUrl('country');
 		if (CostbenefitprojectionHelper::checkString($help_url))
 		{
@@ -194,21 +194,21 @@ class CostbenefitprojectionViewCountry extends JViewLegacy
 		$document->setTitle(JText::_($isNew ? 'COM_COSTBENEFITPROJECTION_COUNTRY_NEW' : 'COM_COSTBENEFITPROJECTION_COUNTRY_EDIT'));
 		$document->addStyleSheet(JURI::root() . "administrator/components/com_costbenefitprojection/assets/css/country.css"); 
 
-		// [6522] Add the CSS for Footable.
+		// [6523] Add the CSS for Footable.
 		$document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable/css/footable.core.min.css');
 
-		// [6524] Use the Metro Style
+		// [6525] Use the Metro Style
 		if (!isset($this->fooTableStyle) || 0 == $this->fooTableStyle)
 		{
 			$document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable/css/footable.metro.min.css');
 		}
-		// [6529] Use the Legacy Style.
+		// [6530] Use the Legacy Style.
 		elseif (isset($this->fooTableStyle) && 1 == $this->fooTableStyle)
 		{
 			$document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable/css/footable.standalone.min.css');
 		}
 
-		// [6534] Add the JavaScript for Footable
+		// [6535] Add the JavaScript for Footable
 		$document->addScript(JURI::root() .'media/com_costbenefitprojection/footable/js/footable.js');
 		$document->addScript(JURI::root() .'media/com_costbenefitprojection/footable/js/footable.sort.js');
 		$document->addScript(JURI::root() .'media/com_costbenefitprojection/footable/js/footable.filter.js');
diff --git a/admin/views/currencies/tmpl/default.php b/admin/views/currencies/tmpl/default.php
index 1c20e349..ae09e478 100644
--- a/admin/views/currencies/tmpl/default.php
+++ b/admin/views/currencies/tmpl/default.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/currencies/tmpl/default_batch_body.php b/admin/views/currencies/tmpl/default_batch_body.php
index 2944c5b3..57dd379d 100644
--- a/admin/views/currencies/tmpl/default_batch_body.php
+++ b/admin/views/currencies/tmpl/default_batch_body.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/currencies/tmpl/default_batch_footer.php b/admin/views/currencies/tmpl/default_batch_footer.php
index a7ac3adb..3a71bda5 100644
--- a/admin/views/currencies/tmpl/default_batch_footer.php
+++ b/admin/views/currencies/tmpl/default_batch_footer.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/currencies/tmpl/default_body.php b/admin/views/currencies/tmpl/default_body.php
index 8d91a71a..0aea42b3 100644
--- a/admin/views/currencies/tmpl/default_body.php
+++ b/admin/views/currencies/tmpl/default_body.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/currencies/tmpl/default_foot.php b/admin/views/currencies/tmpl/default_foot.php
index 5bcb2623..be03864b 100644
--- a/admin/views/currencies/tmpl/default_foot.php
+++ b/admin/views/currencies/tmpl/default_foot.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/currencies/tmpl/default_head.php b/admin/views/currencies/tmpl/default_head.php
index 6a779a34..2924e49d 100644
--- a/admin/views/currencies/tmpl/default_head.php
+++ b/admin/views/currencies/tmpl/default_head.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/currencies/tmpl/default_toolbar.php b/admin/views/currencies/tmpl/default_toolbar.php
index a3976d0c..e6c64ee6 100644
--- a/admin/views/currencies/tmpl/default_toolbar.php
+++ b/admin/views/currencies/tmpl/default_toolbar.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/currencies/view.html.php b/admin/views/currencies/view.html.php
index 9eec2a91..fc488ea3 100644
--- a/admin/views/currencies/view.html.php
+++ b/admin/views/currencies/view.html.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/currency/submitbutton.js b/admin/views/currency/submitbutton.js
index 4f4e179e..a3b804d4 100644
--- a/admin/views/currency/submitbutton.js
+++ b/admin/views/currency/submitbutton.js
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/currency/tmpl/edit.php b/admin/views/currency/tmpl/edit.php
index 1e354940..d1708a4f 100644
--- a/admin/views/currency/tmpl/edit.php
+++ b/admin/views/currency/tmpl/edit.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/currency/view.html.php b/admin/views/currency/view.html.php
index b7b3461d..689bb86f 100644
--- a/admin/views/currency/view.html.php
+++ b/admin/views/currency/view.html.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -86,27 +86,27 @@ class CostbenefitprojectionViewCurrency extends JViewLegacy
 		$isNew = $this->item->id == 0;
 
 		JToolbarHelper::title( JText::_($isNew ? 'COM_COSTBENEFITPROJECTION_CURRENCY_NEW' : 'COM_COSTBENEFITPROJECTION_CURRENCY_EDIT'), 'pencil-2 article-add');
-		// [10277] Built the actions for new and existing records.
+		// [10278] Built the actions for new and existing records.
 		if ($this->refid || $this->ref)
 		{
 			if ($this->canDo->get('currency.create') && $isNew)
 			{
-				// [10289] We can create the record.
+				// [10290] We can create the record.
 				JToolBarHelper::save('currency.save', 'JTOOLBAR_SAVE');
 			}
 			elseif ($this->canDo->get('currency.edit'))
 			{
-				// [10301] We can save the record.
+				// [10302] We can save the record.
 				JToolBarHelper::save('currency.save', 'JTOOLBAR_SAVE');
 			}
 			if ($isNew)
 			{
-				// [10306] Do not creat but cancel.
+				// [10307] Do not creat but cancel.
 				JToolBarHelper::cancel('currency.cancel', 'JTOOLBAR_CANCEL');
 			}
 			else
 			{
-				// [10311] We can close it.
+				// [10312] We can close it.
 				JToolBarHelper::cancel('currency.cancel', 'JTOOLBAR_CLOSE');
 			}
 		}
@@ -114,7 +114,7 @@ class CostbenefitprojectionViewCurrency extends JViewLegacy
 		{
 			if ($isNew)
 			{
-				// [10319] For new records, check the create permission.
+				// [10320] For new records, check the create permission.
 				if ($this->canDo->get('currency.create'))
 				{
 					JToolBarHelper::apply('currency.apply', 'JTOOLBAR_APPLY');
@@ -127,11 +127,11 @@ class CostbenefitprojectionViewCurrency extends JViewLegacy
 			{
 				if ($this->canDo->get('currency.edit'))
 				{
-					// [10346] We can save the new record
+					// [10347] We can save the new record
 					JToolBarHelper::apply('currency.apply', 'JTOOLBAR_APPLY');
 					JToolBarHelper::save('currency.save', 'JTOOLBAR_SAVE');
-					// [10349] We can save this record, but check the create permission to see
-					// [10350] if we can return to make a new one.
+					// [10350] We can save this record, but check the create permission to see
+					// [10351] if we can return to make a new one.
 					if ($this->canDo->get('currency.create'))
 					{
 						JToolBarHelper::custom('currency.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
@@ -150,7 +150,7 @@ class CostbenefitprojectionViewCurrency extends JViewLegacy
 			}
 		}
 		JToolbarHelper::divider();
-		// [10386] set help url for this view if found
+		// [10387] set help url for this view if found
 		$help_url = CostbenefitprojectionHelper::getHelpUrl('currency');
 		if (CostbenefitprojectionHelper::checkString($help_url))
 		{
diff --git a/admin/views/health_data/submitbutton.js b/admin/views/health_data/submitbutton.js
index f6414623..2944f71a 100644
--- a/admin/views/health_data/submitbutton.js
+++ b/admin/views/health_data/submitbutton.js
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/health_data/tmpl/edit.php b/admin/views/health_data/tmpl/edit.php
index ed268db9..2cf711a5 100644
--- a/admin/views/health_data/tmpl/edit.php
+++ b/admin/views/health_data/tmpl/edit.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/health_data/view.html.php b/admin/views/health_data/view.html.php
index 59db9642..7502d2ef 100644
--- a/admin/views/health_data/view.html.php
+++ b/admin/views/health_data/view.html.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -86,27 +86,27 @@ class CostbenefitprojectionViewHealth_data extends JViewLegacy
 		$isNew = $this->item->id == 0;
 
 		JToolbarHelper::title( JText::_($isNew ? 'COM_COSTBENEFITPROJECTION_HEALTH_DATA_NEW' : 'COM_COSTBENEFITPROJECTION_HEALTH_DATA_EDIT'), 'pencil-2 article-add');
-		// [10277] Built the actions for new and existing records.
+		// [10278] Built the actions for new and existing records.
 		if ($this->refid || $this->ref)
 		{
 			if ($this->canDo->get('health_data.create') && $isNew)
 			{
-				// [10289] We can create the record.
+				// [10290] We can create the record.
 				JToolBarHelper::save('health_data.save', 'JTOOLBAR_SAVE');
 			}
 			elseif ($this->canDo->get('health_data.edit'))
 			{
-				// [10301] We can save the record.
+				// [10302] We can save the record.
 				JToolBarHelper::save('health_data.save', 'JTOOLBAR_SAVE');
 			}
 			if ($isNew)
 			{
-				// [10306] Do not creat but cancel.
+				// [10307] Do not creat but cancel.
 				JToolBarHelper::cancel('health_data.cancel', 'JTOOLBAR_CANCEL');
 			}
 			else
 			{
-				// [10311] We can close it.
+				// [10312] We can close it.
 				JToolBarHelper::cancel('health_data.cancel', 'JTOOLBAR_CLOSE');
 			}
 		}
@@ -114,7 +114,7 @@ class CostbenefitprojectionViewHealth_data extends JViewLegacy
 		{
 			if ($isNew)
 			{
-				// [10319] For new records, check the create permission.
+				// [10320] For new records, check the create permission.
 				if ($this->canDo->get('health_data.create'))
 				{
 					JToolBarHelper::apply('health_data.apply', 'JTOOLBAR_APPLY');
@@ -127,11 +127,11 @@ class CostbenefitprojectionViewHealth_data extends JViewLegacy
 			{
 				if ($this->canDo->get('health_data.edit'))
 				{
-					// [10346] We can save the new record
+					// [10347] We can save the new record
 					JToolBarHelper::apply('health_data.apply', 'JTOOLBAR_APPLY');
 					JToolBarHelper::save('health_data.save', 'JTOOLBAR_SAVE');
-					// [10349] We can save this record, but check the create permission to see
-					// [10350] if we can return to make a new one.
+					// [10350] We can save this record, but check the create permission to see
+					// [10351] if we can return to make a new one.
 					if ($this->canDo->get('health_data.create'))
 					{
 						JToolBarHelper::custom('health_data.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
@@ -150,7 +150,7 @@ class CostbenefitprojectionViewHealth_data extends JViewLegacy
 			}
 		}
 		JToolbarHelper::divider();
-		// [10386] set help url for this view if found
+		// [10387] set help url for this view if found
 		$help_url = CostbenefitprojectionHelper::getHelpUrl('health_data');
 		if (CostbenefitprojectionHelper::checkString($help_url))
 		{
diff --git a/admin/views/health_data_sets/tmpl/default.php b/admin/views/health_data_sets/tmpl/default.php
index e2c0913d..e2972245 100644
--- a/admin/views/health_data_sets/tmpl/default.php
+++ b/admin/views/health_data_sets/tmpl/default.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/health_data_sets/tmpl/default_batch_body.php b/admin/views/health_data_sets/tmpl/default_batch_body.php
index 41a051df..58f63864 100644
--- a/admin/views/health_data_sets/tmpl/default_batch_body.php
+++ b/admin/views/health_data_sets/tmpl/default_batch_body.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/health_data_sets/tmpl/default_batch_footer.php b/admin/views/health_data_sets/tmpl/default_batch_footer.php
index 84674e64..b2c9f63f 100644
--- a/admin/views/health_data_sets/tmpl/default_batch_footer.php
+++ b/admin/views/health_data_sets/tmpl/default_batch_footer.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/health_data_sets/tmpl/default_body.php b/admin/views/health_data_sets/tmpl/default_body.php
index fb34ac63..f69d8131 100644
--- a/admin/views/health_data_sets/tmpl/default_body.php
+++ b/admin/views/health_data_sets/tmpl/default_body.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/health_data_sets/tmpl/default_foot.php b/admin/views/health_data_sets/tmpl/default_foot.php
index 62825b17..ac000519 100644
--- a/admin/views/health_data_sets/tmpl/default_foot.php
+++ b/admin/views/health_data_sets/tmpl/default_foot.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/health_data_sets/tmpl/default_head.php b/admin/views/health_data_sets/tmpl/default_head.php
index b8586380..f66f4177 100644
--- a/admin/views/health_data_sets/tmpl/default_head.php
+++ b/admin/views/health_data_sets/tmpl/default_head.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/health_data_sets/tmpl/default_toolbar.php b/admin/views/health_data_sets/tmpl/default_toolbar.php
index 1393dd67..e86b7ebf 100644
--- a/admin/views/health_data_sets/tmpl/default_toolbar.php
+++ b/admin/views/health_data_sets/tmpl/default_toolbar.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/health_data_sets/view.html.php b/admin/views/health_data_sets/view.html.php
index 458cb32c..2f3f3357 100644
--- a/admin/views/health_data_sets/view.html.php
+++ b/admin/views/health_data_sets/view.html.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -196,11 +196,11 @@ class CostbenefitprojectionViewHealth_data_sets extends JViewLegacy
 			);
                 }  
 
-		// [9115] Set Causerisk Name Selection
+		// [9116] Set Causerisk Name Selection
 		$this->causeriskNameOptions = JFormHelper::loadFieldType('Causesrisks')->getOptions();
 		if ($this->causeriskNameOptions)
 		{
-			// [9119] Causerisk Name Filter
+			// [9120] Causerisk Name Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COSTBENEFITPROJECTION_HEALTH_DATA_CAUSERISK_LABEL').' -',
 				'filter_causerisk',
@@ -209,7 +209,7 @@ class CostbenefitprojectionViewHealth_data_sets extends JViewLegacy
 
 			if ($this->canBatch && $this->canCreate && $this->canEdit)
 			{
-				// [9128] Causerisk Name Batch Selection
+				// [9129] Causerisk Name Batch Selection
 				JHtmlBatch_::addListSelection(
 					'- Keep Original '.JText::_('COM_COSTBENEFITPROJECTION_HEALTH_DATA_CAUSERISK_LABEL').' -',
 					'batch[causerisk]',
@@ -218,11 +218,11 @@ class CostbenefitprojectionViewHealth_data_sets extends JViewLegacy
 			}
 		}
 
-		// [9149] Set Year Selection
+		// [9150] Set Year Selection
 		$this->yearOptions = $this->getTheYearSelections();
 		if ($this->yearOptions)
 		{
-			// [9153] Year Filter
+			// [9154] Year Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COSTBENEFITPROJECTION_HEALTH_DATA_YEAR_LABEL').' -',
 				'filter_year',
@@ -231,7 +231,7 @@ class CostbenefitprojectionViewHealth_data_sets extends JViewLegacy
 
 			if ($this->canBatch && $this->canCreate && $this->canEdit)
 			{
-				// [9162] Year Batch Selection
+				// [9163] Year Batch Selection
 				JHtmlBatch_::addListSelection(
 					'- Keep Original '.JText::_('COM_COSTBENEFITPROJECTION_HEALTH_DATA_YEAR_LABEL').' -',
 					'batch[year]',
@@ -240,11 +240,11 @@ class CostbenefitprojectionViewHealth_data_sets extends JViewLegacy
 			}
 		}
 
-		// [9115] Set Country Name Selection
+		// [9116] Set Country Name Selection
 		$this->countryNameOptions = JFormHelper::loadFieldType('Countries')->getOptions();
 		if ($this->countryNameOptions)
 		{
-			// [9119] Country Name Filter
+			// [9120] Country Name Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COSTBENEFITPROJECTION_HEALTH_DATA_COUNTRY_LABEL').' -',
 				'filter_country',
@@ -253,7 +253,7 @@ class CostbenefitprojectionViewHealth_data_sets extends JViewLegacy
 
 			if ($this->canBatch && $this->canCreate && $this->canEdit)
 			{
-				// [9128] Country Name Batch Selection
+				// [9129] Country Name Batch Selection
 				JHtmlBatch_::addListSelection(
 					'- Keep Original '.JText::_('COM_COSTBENEFITPROJECTION_HEALTH_DATA_COUNTRY_LABEL').' -',
 					'batch[country]',
@@ -312,33 +312,33 @@ class CostbenefitprojectionViewHealth_data_sets extends JViewLegacy
 
 	protected function getTheYearSelections()
 	{
-		// [9025] Get a db connection.
+		// [9026] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [9027] Create a new query object.
+		// [9028] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [9029] Select the text.
+		// [9030] Select the text.
 		$query->select($db->quoteName('year'));
 		$query->from($db->quoteName('#__costbenefitprojection_health_data'));
 		$query->order($db->quoteName('year') . ' ASC');
 
-		// [9033] Reset the query using our newly populated query object.
+		// [9034] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
 		$results = $db->loadColumn();
 
 		if ($results)
 		{
-			// [9041] get model
+			// [9042] get model
 			$model = $this->getModel();
 			$results = array_unique($results);
 			$filter = array();
 			foreach ($results as $year)
 			{
-				// [9052] Translate the year selection
+				// [9053] Translate the year selection
 				$text = $model->selectionTranslation($year,'year');
-				// [9054] Now add the year and its text to the options array
+				// [9055] Now add the year and its text to the options array
 				$filter[] = JHtml::_('select.option', $year, JText::_($text));
 			}
 			return $filter;
diff --git a/admin/views/help_document/submitbutton.js b/admin/views/help_document/submitbutton.js
index a13e3439..68651ead 100644
--- a/admin/views/help_document/submitbutton.js
+++ b/admin/views/help_document/submitbutton.js
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/help_document/tmpl/edit.php b/admin/views/help_document/tmpl/edit.php
index 589ad4e6..6faf2c69 100644
--- a/admin/views/help_document/tmpl/edit.php
+++ b/admin/views/help_document/tmpl/edit.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -94,93 +94,93 @@ $componentParams = JComponentHelper::getParams('com_costbenefitprojection');
 
 <script type="text/javascript">
 
-// #jform_location listeners for location_clqPnOc function
+// #jform_location listeners for location_jxuQynV function
 jQuery('#jform_location').on('keyup',function()
 {
-	var location_clqPnOc = jQuery("#jform_location input[type='radio']:checked").val();
-	clqPnOc(location_clqPnOc);
+	var location_jxuQynV = jQuery("#jform_location input[type='radio']:checked").val();
+	jxuQynV(location_jxuQynV);
 
 });
 jQuery('#adminForm').on('change', '#jform_location',function (e)
 {
 	e.preventDefault();
-	var location_clqPnOc = jQuery("#jform_location input[type='radio']:checked").val();
-	clqPnOc(location_clqPnOc);
+	var location_jxuQynV = jQuery("#jform_location input[type='radio']:checked").val();
+	jxuQynV(location_jxuQynV);
 
 });
 
-// #jform_location listeners for location_jWExvAv function
+// #jform_location listeners for location_tcNfMZq function
 jQuery('#jform_location').on('keyup',function()
 {
-	var location_jWExvAv = jQuery("#jform_location input[type='radio']:checked").val();
-	jWExvAv(location_jWExvAv);
+	var location_tcNfMZq = jQuery("#jform_location input[type='radio']:checked").val();
+	tcNfMZq(location_tcNfMZq);
 
 });
 jQuery('#adminForm').on('change', '#jform_location',function (e)
 {
 	e.preventDefault();
-	var location_jWExvAv = jQuery("#jform_location input[type='radio']:checked").val();
-	jWExvAv(location_jWExvAv);
+	var location_tcNfMZq = jQuery("#jform_location input[type='radio']:checked").val();
+	tcNfMZq(location_tcNfMZq);
 
 });
 
-// #jform_type listeners for type_PAoOXjB function
+// #jform_type listeners for type_CiLvGkz function
 jQuery('#jform_type').on('keyup',function()
 {
-	var type_PAoOXjB = jQuery("#jform_type").val();
-	PAoOXjB(type_PAoOXjB);
+	var type_CiLvGkz = jQuery("#jform_type").val();
+	CiLvGkz(type_CiLvGkz);
 
 });
 jQuery('#adminForm').on('change', '#jform_type',function (e)
 {
 	e.preventDefault();
-	var type_PAoOXjB = jQuery("#jform_type").val();
-	PAoOXjB(type_PAoOXjB);
+	var type_CiLvGkz = jQuery("#jform_type").val();
+	CiLvGkz(type_CiLvGkz);
 
 });
 
-// #jform_type listeners for type_lBBAnFI function
+// #jform_type listeners for type_TBqocUA function
 jQuery('#jform_type').on('keyup',function()
 {
-	var type_lBBAnFI = jQuery("#jform_type").val();
-	lBBAnFI(type_lBBAnFI);
+	var type_TBqocUA = jQuery("#jform_type").val();
+	TBqocUA(type_TBqocUA);
 
 });
 jQuery('#adminForm').on('change', '#jform_type',function (e)
 {
 	e.preventDefault();
-	var type_lBBAnFI = jQuery("#jform_type").val();
-	lBBAnFI(type_lBBAnFI);
+	var type_TBqocUA = jQuery("#jform_type").val();
+	TBqocUA(type_TBqocUA);
 
 });
 
-// #jform_type listeners for type_bpRduNM function
+// #jform_type listeners for type_dQlZimN function
 jQuery('#jform_type').on('keyup',function()
 {
-	var type_bpRduNM = jQuery("#jform_type").val();
-	bpRduNM(type_bpRduNM);
+	var type_dQlZimN = jQuery("#jform_type").val();
+	dQlZimN(type_dQlZimN);
 
 });
 jQuery('#adminForm').on('change', '#jform_type',function (e)
 {
 	e.preventDefault();
-	var type_bpRduNM = jQuery("#jform_type").val();
-	bpRduNM(type_bpRduNM);
+	var type_dQlZimN = jQuery("#jform_type").val();
+	dQlZimN(type_dQlZimN);
 
 });
 
-// #jform_target listeners for target_mdMKRGQ function
+// #jform_target listeners for target_BBVrdIC function
 jQuery('#jform_target').on('keyup',function()
 {
-	var target_mdMKRGQ = jQuery("#jform_target input[type='radio']:checked").val();
-	mdMKRGQ(target_mdMKRGQ);
+	var target_BBVrdIC = jQuery("#jform_target input[type='radio']:checked").val();
+	BBVrdIC(target_BBVrdIC);
 
 });
 jQuery('#adminForm').on('change', '#jform_target',function (e)
 {
 	e.preventDefault();
-	var target_mdMKRGQ = jQuery("#jform_target input[type='radio']:checked").val();
-	mdMKRGQ(target_mdMKRGQ);
+	var target_BBVrdIC = jQuery("#jform_target input[type='radio']:checked").val();
+	BBVrdIC(target_BBVrdIC);
 
 });
 
diff --git a/admin/views/help_document/view.html.php b/admin/views/help_document/view.html.php
index 4f631d9f..420ef6b1 100644
--- a/admin/views/help_document/view.html.php
+++ b/admin/views/help_document/view.html.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -86,27 +86,27 @@ class CostbenefitprojectionViewHelp_document extends JViewLegacy
 		$isNew = $this->item->id == 0;
 
 		JToolbarHelper::title( JText::_($isNew ? 'COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_NEW' : 'COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_EDIT'), 'pencil-2 article-add');
-		// [10277] Built the actions for new and existing records.
+		// [10278] Built the actions for new and existing records.
 		if ($this->refid || $this->ref)
 		{
 			if ($this->canDo->get('help_document.create') && $isNew)
 			{
-				// [10289] We can create the record.
+				// [10290] We can create the record.
 				JToolBarHelper::save('help_document.save', 'JTOOLBAR_SAVE');
 			}
 			elseif ($this->canDo->get('help_document.edit'))
 			{
-				// [10301] We can save the record.
+				// [10302] We can save the record.
 				JToolBarHelper::save('help_document.save', 'JTOOLBAR_SAVE');
 			}
 			if ($isNew)
 			{
-				// [10306] Do not creat but cancel.
+				// [10307] Do not creat but cancel.
 				JToolBarHelper::cancel('help_document.cancel', 'JTOOLBAR_CANCEL');
 			}
 			else
 			{
-				// [10311] We can close it.
+				// [10312] We can close it.
 				JToolBarHelper::cancel('help_document.cancel', 'JTOOLBAR_CLOSE');
 			}
 		}
@@ -114,7 +114,7 @@ class CostbenefitprojectionViewHelp_document extends JViewLegacy
 		{
 			if ($isNew)
 			{
-				// [10319] For new records, check the create permission.
+				// [10320] For new records, check the create permission.
 				if ($this->canDo->get('help_document.create'))
 				{
 					JToolBarHelper::apply('help_document.apply', 'JTOOLBAR_APPLY');
@@ -127,11 +127,11 @@ class CostbenefitprojectionViewHelp_document extends JViewLegacy
 			{
 				if ($this->canDo->get('help_document.edit'))
 				{
-					// [10346] We can save the new record
+					// [10347] We can save the new record
 					JToolBarHelper::apply('help_document.apply', 'JTOOLBAR_APPLY');
 					JToolBarHelper::save('help_document.save', 'JTOOLBAR_SAVE');
-					// [10349] We can save this record, but check the create permission to see
-					// [10350] if we can return to make a new one.
+					// [10350] We can save this record, but check the create permission to see
+					// [10351] if we can return to make a new one.
 					if ($this->canDo->get('help_document.create'))
 					{
 						JToolBarHelper::custom('help_document.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
@@ -150,7 +150,7 @@ class CostbenefitprojectionViewHelp_document extends JViewLegacy
 			}
 		}
 		JToolbarHelper::divider();
-		// [10386] set help url for this view if found
+		// [10387] set help url for this view if found
 		$help_url = CostbenefitprojectionHelper::getHelpUrl('help_document');
 		if (CostbenefitprojectionHelper::checkString($help_url))
 		{
diff --git a/admin/views/help_documents/tmpl/default.php b/admin/views/help_documents/tmpl/default.php
index 9166d801..ce7dfffe 100644
--- a/admin/views/help_documents/tmpl/default.php
+++ b/admin/views/help_documents/tmpl/default.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/help_documents/tmpl/default_batch_body.php b/admin/views/help_documents/tmpl/default_batch_body.php
index 90bef328..46afca2b 100644
--- a/admin/views/help_documents/tmpl/default_batch_body.php
+++ b/admin/views/help_documents/tmpl/default_batch_body.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/help_documents/tmpl/default_batch_footer.php b/admin/views/help_documents/tmpl/default_batch_footer.php
index 292f682a..242b64a9 100644
--- a/admin/views/help_documents/tmpl/default_batch_footer.php
+++ b/admin/views/help_documents/tmpl/default_batch_footer.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/help_documents/tmpl/default_body.php b/admin/views/help_documents/tmpl/default_body.php
index 8c17227f..2b68825d 100644
--- a/admin/views/help_documents/tmpl/default_body.php
+++ b/admin/views/help_documents/tmpl/default_body.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/help_documents/tmpl/default_foot.php b/admin/views/help_documents/tmpl/default_foot.php
index a586c5df..7f7a9426 100644
--- a/admin/views/help_documents/tmpl/default_foot.php
+++ b/admin/views/help_documents/tmpl/default_foot.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/help_documents/tmpl/default_head.php b/admin/views/help_documents/tmpl/default_head.php
index 3381c5e8..814866a9 100644
--- a/admin/views/help_documents/tmpl/default_head.php
+++ b/admin/views/help_documents/tmpl/default_head.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/help_documents/tmpl/default_toolbar.php b/admin/views/help_documents/tmpl/default_toolbar.php
index b5349f0f..fc91fec8 100644
--- a/admin/views/help_documents/tmpl/default_toolbar.php
+++ b/admin/views/help_documents/tmpl/default_toolbar.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/help_documents/view.html.php b/admin/views/help_documents/view.html.php
index f8fe1bb7..b4d0265a 100644
--- a/admin/views/help_documents/view.html.php
+++ b/admin/views/help_documents/view.html.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -196,11 +196,11 @@ class CostbenefitprojectionViewHelp_documents extends JViewLegacy
 			);
                 }  
 
-		// [9149] Set Type Selection
+		// [9150] Set Type Selection
 		$this->typeOptions = $this->getTheTypeSelections();
 		if ($this->typeOptions)
 		{
-			// [9153] Type Filter
+			// [9154] Type Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_TYPE_LABEL').' -',
 				'filter_type',
@@ -209,7 +209,7 @@ class CostbenefitprojectionViewHelp_documents extends JViewLegacy
 
 			if ($this->canBatch && $this->canCreate && $this->canEdit)
 			{
-				// [9162] Type Batch Selection
+				// [9163] Type Batch Selection
 				JHtmlBatch_::addListSelection(
 					'- Keep Original '.JText::_('COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_TYPE_LABEL').' -',
 					'batch[type]',
@@ -218,11 +218,11 @@ class CostbenefitprojectionViewHelp_documents extends JViewLegacy
 			}
 		}
 
-		// [9149] Set Location Selection
+		// [9150] Set Location Selection
 		$this->locationOptions = $this->getTheLocationSelections();
 		if ($this->locationOptions)
 		{
-			// [9153] Location Filter
+			// [9154] Location Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_LOCATION_LABEL').' -',
 				'filter_location',
@@ -231,7 +231,7 @@ class CostbenefitprojectionViewHelp_documents extends JViewLegacy
 
 			if ($this->canBatch && $this->canCreate && $this->canEdit)
 			{
-				// [9162] Location Batch Selection
+				// [9163] Location Batch Selection
 				JHtmlBatch_::addListSelection(
 					'- Keep Original '.JText::_('COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_LOCATION_LABEL').' -',
 					'batch[location]',
@@ -240,11 +240,11 @@ class CostbenefitprojectionViewHelp_documents extends JViewLegacy
 			}
 		}
 
-		// [9149] Set Admin View Selection
+		// [9150] Set Admin View Selection
 		$this->admin_viewOptions = $this->getTheAdmin_viewSelections();
 		if ($this->admin_viewOptions)
 		{
-			// [9153] Admin View Filter
+			// [9154] Admin View Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_ADMIN_VIEW_LABEL').' -',
 				'filter_admin_view',
@@ -253,7 +253,7 @@ class CostbenefitprojectionViewHelp_documents extends JViewLegacy
 
 			if ($this->canBatch && $this->canCreate && $this->canEdit)
 			{
-				// [9162] Admin View Batch Selection
+				// [9163] Admin View Batch Selection
 				JHtmlBatch_::addListSelection(
 					'- Keep Original '.JText::_('COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_ADMIN_VIEW_LABEL').' -',
 					'batch[admin_view]',
@@ -262,11 +262,11 @@ class CostbenefitprojectionViewHelp_documents extends JViewLegacy
 			}
 		}
 
-		// [9149] Set Site View Selection
+		// [9150] Set Site View Selection
 		$this->site_viewOptions = $this->getTheSite_viewSelections();
 		if ($this->site_viewOptions)
 		{
-			// [9153] Site View Filter
+			// [9154] Site View Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_SITE_VIEW_LABEL').' -',
 				'filter_site_view',
@@ -275,7 +275,7 @@ class CostbenefitprojectionViewHelp_documents extends JViewLegacy
 
 			if ($this->canBatch && $this->canCreate && $this->canEdit)
 			{
-				// [9162] Site View Batch Selection
+				// [9163] Site View Batch Selection
 				JHtmlBatch_::addListSelection(
 					'- Keep Original '.JText::_('COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_SITE_VIEW_LABEL').' -',
 					'batch[site_view]',
@@ -336,33 +336,33 @@ class CostbenefitprojectionViewHelp_documents extends JViewLegacy
 
 	protected function getTheTypeSelections()
 	{
-		// [9025] Get a db connection.
+		// [9026] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [9027] Create a new query object.
+		// [9028] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [9029] Select the text.
+		// [9030] Select the text.
 		$query->select($db->quoteName('type'));
 		$query->from($db->quoteName('#__costbenefitprojection_help_document'));
 		$query->order($db->quoteName('type') . ' ASC');
 
-		// [9033] Reset the query using our newly populated query object.
+		// [9034] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
 		$results = $db->loadColumn();
 
 		if ($results)
 		{
-			// [9041] get model
+			// [9042] get model
 			$model = $this->getModel();
 			$results = array_unique($results);
 			$filter = array();
 			foreach ($results as $type)
 			{
-				// [9052] Translate the type selection
+				// [9053] Translate the type selection
 				$text = $model->selectionTranslation($type,'type');
-				// [9054] Now add the type and its text to the options array
+				// [9055] Now add the type and its text to the options array
 				$filter[] = JHtml::_('select.option', $type, JText::_($text));
 			}
 			return $filter;
@@ -372,33 +372,33 @@ class CostbenefitprojectionViewHelp_documents extends JViewLegacy
 
 	protected function getTheLocationSelections()
 	{
-		// [9025] Get a db connection.
+		// [9026] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [9027] Create a new query object.
+		// [9028] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [9029] Select the text.
+		// [9030] Select the text.
 		$query->select($db->quoteName('location'));
 		$query->from($db->quoteName('#__costbenefitprojection_help_document'));
 		$query->order($db->quoteName('location') . ' ASC');
 
-		// [9033] Reset the query using our newly populated query object.
+		// [9034] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
 		$results = $db->loadColumn();
 
 		if ($results)
 		{
-			// [9041] get model
+			// [9042] get model
 			$model = $this->getModel();
 			$results = array_unique($results);
 			$filter = array();
 			foreach ($results as $location)
 			{
-				// [9052] Translate the location selection
+				// [9053] Translate the location selection
 				$text = $model->selectionTranslation($location,'location');
-				// [9054] Now add the location and its text to the options array
+				// [9055] Now add the location and its text to the options array
 				$filter[] = JHtml::_('select.option', $location, JText::_($text));
 			}
 			return $filter;
@@ -408,18 +408,18 @@ class CostbenefitprojectionViewHelp_documents extends JViewLegacy
 
 	protected function getTheAdmin_viewSelections()
 	{
-		// [9025] Get a db connection.
+		// [9026] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [9027] Create a new query object.
+		// [9028] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [9029] Select the text.
+		// [9030] Select the text.
 		$query->select($db->quoteName('admin_view'));
 		$query->from($db->quoteName('#__costbenefitprojection_help_document'));
 		$query->order($db->quoteName('admin_view') . ' ASC');
 
-		// [9033] Reset the query using our newly populated query object.
+		// [9034] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
 		$results = $db->loadColumn();
@@ -430,7 +430,7 @@ class CostbenefitprojectionViewHelp_documents extends JViewLegacy
 			$filter = array();
 			foreach ($results as $admin_view)
 			{
-				// [9059] Now add the admin_view and its text to the options array
+				// [9060] Now add the admin_view and its text to the options array
 				$filter[] = JHtml::_('select.option', $admin_view, $admin_view);
 			}
 			return $filter;
@@ -440,18 +440,18 @@ class CostbenefitprojectionViewHelp_documents extends JViewLegacy
 
 	protected function getTheSite_viewSelections()
 	{
-		// [9025] Get a db connection.
+		// [9026] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [9027] Create a new query object.
+		// [9028] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [9029] Select the text.
+		// [9030] Select the text.
 		$query->select($db->quoteName('site_view'));
 		$query->from($db->quoteName('#__costbenefitprojection_help_document'));
 		$query->order($db->quoteName('site_view') . ' ASC');
 
-		// [9033] Reset the query using our newly populated query object.
+		// [9034] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
 		$results = $db->loadColumn();
@@ -462,7 +462,7 @@ class CostbenefitprojectionViewHelp_documents extends JViewLegacy
 			$filter = array();
 			foreach ($results as $site_view)
 			{
-				// [9059] Now add the site_view and its text to the options array
+				// [9060] Now add the site_view and its text to the options array
 				$filter[] = JHtml::_('select.option', $site_view, $site_view);
 			}
 			return $filter;
diff --git a/admin/views/import/tmpl/default.php b/admin/views/import/tmpl/default.php
index 523ca484..cdec7136 100644
--- a/admin/views/import/tmpl/default.php
+++ b/admin/views/import/tmpl/default.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/import/view.html.php b/admin/views/import/view.html.php
index 24780777..4c76d744 100644
--- a/admin/views/import/view.html.php
+++ b/admin/views/import/view.html.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/intervention/submitbutton.js b/admin/views/intervention/submitbutton.js
index 873b8dea..45154c75 100644
--- a/admin/views/intervention/submitbutton.js
+++ b/admin/views/intervention/submitbutton.js
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/intervention/tmpl/edit.php b/admin/views/intervention/tmpl/edit.php
index f232f85e..11fb9528 100644
--- a/admin/views/intervention/tmpl/edit.php
+++ b/admin/views/intervention/tmpl/edit.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -101,33 +101,33 @@ $componentParams = JComponentHelper::getParams('com_costbenefitprojection');
 
 <script type="text/javascript">
 
-// #jform_type listeners for type_ugSWqSH function
+// #jform_type listeners for type_WkmQDwg function
 jQuery('#jform_type').on('keyup',function()
 {
-	var type_ugSWqSH = jQuery("#jform_type input[type='radio']:checked").val();
-	ugSWqSH(type_ugSWqSH);
+	var type_WkmQDwg = jQuery("#jform_type input[type='radio']:checked").val();
+	WkmQDwg(type_WkmQDwg);
 
 });
 jQuery('#adminForm').on('change', '#jform_type',function (e)
 {
 	e.preventDefault();
-	var type_ugSWqSH = jQuery("#jform_type input[type='radio']:checked").val();
-	ugSWqSH(type_ugSWqSH);
+	var type_WkmQDwg = jQuery("#jform_type input[type='radio']:checked").val();
+	WkmQDwg(type_WkmQDwg);
 
 });
 
-// #jform_type listeners for type_bnFuIkh function
+// #jform_type listeners for type_rAiqAEp function
 jQuery('#jform_type').on('keyup',function()
 {
-	var type_bnFuIkh = jQuery("#jform_type input[type='radio']:checked").val();
-	bnFuIkh(type_bnFuIkh);
+	var type_rAiqAEp = jQuery("#jform_type input[type='radio']:checked").val();
+	rAiqAEp(type_rAiqAEp);
 
 });
 jQuery('#adminForm').on('change', '#jform_type',function (e)
 {
 	e.preventDefault();
-	var type_bnFuIkh = jQuery("#jform_type input[type='radio']:checked").val();
-	bnFuIkh(type_bnFuIkh);
+	var type_rAiqAEp = jQuery("#jform_type input[type='radio']:checked").val();
+	rAiqAEp(type_rAiqAEp);
 
 });
 
diff --git a/admin/views/intervention/view.html.php b/admin/views/intervention/view.html.php
index 11a1db03..924ccc46 100644
--- a/admin/views/intervention/view.html.php
+++ b/admin/views/intervention/view.html.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -86,27 +86,27 @@ class CostbenefitprojectionViewIntervention extends JViewLegacy
 		$isNew = $this->item->id == 0;
 
 		JToolbarHelper::title( JText::_($isNew ? 'COM_COSTBENEFITPROJECTION_INTERVENTION_NEW' : 'COM_COSTBENEFITPROJECTION_INTERVENTION_EDIT'), 'pencil-2 article-add');
-		// [10277] Built the actions for new and existing records.
+		// [10278] Built the actions for new and existing records.
 		if ($this->refid || $this->ref)
 		{
 			if ($this->canDo->get('intervention.create') && $isNew)
 			{
-				// [10289] We can create the record.
+				// [10290] We can create the record.
 				JToolBarHelper::save('intervention.save', 'JTOOLBAR_SAVE');
 			}
 			elseif ($this->canDo->get('intervention.edit'))
 			{
-				// [10301] We can save the record.
+				// [10302] We can save the record.
 				JToolBarHelper::save('intervention.save', 'JTOOLBAR_SAVE');
 			}
 			if ($isNew)
 			{
-				// [10306] Do not creat but cancel.
+				// [10307] Do not creat but cancel.
 				JToolBarHelper::cancel('intervention.cancel', 'JTOOLBAR_CANCEL');
 			}
 			else
 			{
-				// [10311] We can close it.
+				// [10312] We can close it.
 				JToolBarHelper::cancel('intervention.cancel', 'JTOOLBAR_CLOSE');
 			}
 		}
@@ -114,7 +114,7 @@ class CostbenefitprojectionViewIntervention extends JViewLegacy
 		{
 			if ($isNew)
 			{
-				// [10319] For new records, check the create permission.
+				// [10320] For new records, check the create permission.
 				if ($this->canDo->get('intervention.create'))
 				{
 					JToolBarHelper::apply('intervention.apply', 'JTOOLBAR_APPLY');
@@ -127,11 +127,11 @@ class CostbenefitprojectionViewIntervention extends JViewLegacy
 			{
 				if ($this->canDo->get('intervention.edit'))
 				{
-					// [10346] We can save the new record
+					// [10347] We can save the new record
 					JToolBarHelper::apply('intervention.apply', 'JTOOLBAR_APPLY');
 					JToolBarHelper::save('intervention.save', 'JTOOLBAR_SAVE');
-					// [10349] We can save this record, but check the create permission to see
-					// [10350] if we can return to make a new one.
+					// [10350] We can save this record, but check the create permission to see
+					// [10351] if we can return to make a new one.
 					if ($this->canDo->get('intervention.create'))
 					{
 						JToolBarHelper::custom('intervention.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
@@ -150,7 +150,7 @@ class CostbenefitprojectionViewIntervention extends JViewLegacy
 			}
 		}
 		JToolbarHelper::divider();
-		// [10386] set help url for this view if found
+		// [10387] set help url for this view if found
 		$help_url = CostbenefitprojectionHelper::getHelpUrl('intervention');
 		if (CostbenefitprojectionHelper::checkString($help_url))
 		{
@@ -187,7 +187,7 @@ class CostbenefitprojectionViewIntervention extends JViewLegacy
 		$document = JFactory::getDocument();
 		$document->setTitle(JText::_($isNew ? 'COM_COSTBENEFITPROJECTION_INTERVENTION_NEW' : 'COM_COSTBENEFITPROJECTION_INTERVENTION_EDIT'));
 		$document->addStyleSheet(JURI::root() . "administrator/components/com_costbenefitprojection/assets/css/intervention.css");
-		// [8807] Add Ajax Token
+		// [8808] Add Ajax Token
 		$document->addScriptDeclaration("var token = '".JSession::getFormToken()."';"); 
 		$document->addScript(JURI::root() . $this->script);
 		$document->addScript(JURI::root() . "administrator/components/com_costbenefitprojection/views/intervention/submitbutton.js");
diff --git a/admin/views/interventions/tmpl/default.php b/admin/views/interventions/tmpl/default.php
index f5394914..416d97d3 100644
--- a/admin/views/interventions/tmpl/default.php
+++ b/admin/views/interventions/tmpl/default.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/interventions/tmpl/default_batch_body.php b/admin/views/interventions/tmpl/default_batch_body.php
index c9bec10a..22dc1077 100644
--- a/admin/views/interventions/tmpl/default_batch_body.php
+++ b/admin/views/interventions/tmpl/default_batch_body.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/interventions/tmpl/default_batch_footer.php b/admin/views/interventions/tmpl/default_batch_footer.php
index c9969d46..c9fa5646 100644
--- a/admin/views/interventions/tmpl/default_batch_footer.php
+++ b/admin/views/interventions/tmpl/default_batch_footer.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/interventions/tmpl/default_body.php b/admin/views/interventions/tmpl/default_body.php
index 328ad1cc..38420053 100644
--- a/admin/views/interventions/tmpl/default_body.php
+++ b/admin/views/interventions/tmpl/default_body.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/interventions/tmpl/default_foot.php b/admin/views/interventions/tmpl/default_foot.php
index a586c5df..7f7a9426 100644
--- a/admin/views/interventions/tmpl/default_foot.php
+++ b/admin/views/interventions/tmpl/default_foot.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/interventions/tmpl/default_head.php b/admin/views/interventions/tmpl/default_head.php
index aa9d4874..4d7d668e 100644
--- a/admin/views/interventions/tmpl/default_head.php
+++ b/admin/views/interventions/tmpl/default_head.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/interventions/tmpl/default_toolbar.php b/admin/views/interventions/tmpl/default_toolbar.php
index b013c18b..7af39ef5 100644
--- a/admin/views/interventions/tmpl/default_toolbar.php
+++ b/admin/views/interventions/tmpl/default_toolbar.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/interventions/view.html.php b/admin/views/interventions/view.html.php
index 8d07108d..370b1481 100644
--- a/admin/views/interventions/view.html.php
+++ b/admin/views/interventions/view.html.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -196,11 +196,11 @@ class CostbenefitprojectionViewInterventions extends JViewLegacy
 			);
                 }  
 
-		// [9115] Set Company Name Selection
+		// [9116] Set Company Name Selection
 		$this->companyNameOptions = JFormHelper::loadFieldType('Company')->getOptions();
 		if ($this->companyNameOptions)
 		{
-			// [9119] Company Name Filter
+			// [9120] Company Name Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COSTBENEFITPROJECTION_INTERVENTION_COMPANY_LABEL').' -',
 				'filter_company',
@@ -209,7 +209,7 @@ class CostbenefitprojectionViewInterventions extends JViewLegacy
 
 			if ($this->canBatch && $this->canCreate && $this->canEdit)
 			{
-				// [9128] Company Name Batch Selection
+				// [9129] Company Name Batch Selection
 				JHtmlBatch_::addListSelection(
 					'- Keep Original '.JText::_('COM_COSTBENEFITPROJECTION_INTERVENTION_COMPANY_LABEL').' -',
 					'batch[company]',
@@ -218,11 +218,11 @@ class CostbenefitprojectionViewInterventions extends JViewLegacy
 			}
 		}
 
-		// [9149] Set Type Selection
+		// [9150] Set Type Selection
 		$this->typeOptions = $this->getTheTypeSelections();
 		if ($this->typeOptions)
 		{
-			// [9153] Type Filter
+			// [9154] Type Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COSTBENEFITPROJECTION_INTERVENTION_TYPE_LABEL').' -',
 				'filter_type',
@@ -231,7 +231,7 @@ class CostbenefitprojectionViewInterventions extends JViewLegacy
 
 			if ($this->canBatch && $this->canCreate && $this->canEdit)
 			{
-				// [9162] Type Batch Selection
+				// [9163] Type Batch Selection
 				JHtmlBatch_::addListSelection(
 					'- Keep Original '.JText::_('COM_COSTBENEFITPROJECTION_INTERVENTION_TYPE_LABEL').' -',
 					'batch[type]',
@@ -240,11 +240,11 @@ class CostbenefitprojectionViewInterventions extends JViewLegacy
 			}
 		}
 
-		// [9149] Set Coverage Selection
+		// [9150] Set Coverage Selection
 		$this->coverageOptions = $this->getTheCoverageSelections();
 		if ($this->coverageOptions)
 		{
-			// [9153] Coverage Filter
+			// [9154] Coverage Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COSTBENEFITPROJECTION_INTERVENTION_COVERAGE_LABEL').' -',
 				'filter_coverage',
@@ -253,7 +253,7 @@ class CostbenefitprojectionViewInterventions extends JViewLegacy
 
 			if ($this->canBatch && $this->canCreate && $this->canEdit)
 			{
-				// [9162] Coverage Batch Selection
+				// [9163] Coverage Batch Selection
 				JHtmlBatch_::addListSelection(
 					'- Keep Original '.JText::_('COM_COSTBENEFITPROJECTION_INTERVENTION_COVERAGE_LABEL').' -',
 					'batch[coverage]',
@@ -262,11 +262,11 @@ class CostbenefitprojectionViewInterventions extends JViewLegacy
 			}
 		}
 
-		// [9149] Set Duration Selection
+		// [9150] Set Duration Selection
 		$this->durationOptions = $this->getTheDurationSelections();
 		if ($this->durationOptions)
 		{
-			// [9153] Duration Filter
+			// [9154] Duration Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COSTBENEFITPROJECTION_INTERVENTION_DURATION_LABEL').' -',
 				'filter_duration',
@@ -275,7 +275,7 @@ class CostbenefitprojectionViewInterventions extends JViewLegacy
 
 			if ($this->canBatch && $this->canCreate && $this->canEdit)
 			{
-				// [9162] Duration Batch Selection
+				// [9163] Duration Batch Selection
 				JHtmlBatch_::addListSelection(
 					'- Keep Original '.JText::_('COM_COSTBENEFITPROJECTION_INTERVENTION_DURATION_LABEL').' -',
 					'batch[duration]',
@@ -337,33 +337,33 @@ class CostbenefitprojectionViewInterventions extends JViewLegacy
 
 	protected function getTheTypeSelections()
 	{
-		// [9025] Get a db connection.
+		// [9026] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [9027] Create a new query object.
+		// [9028] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [9029] Select the text.
+		// [9030] Select the text.
 		$query->select($db->quoteName('type'));
 		$query->from($db->quoteName('#__costbenefitprojection_intervention'));
 		$query->order($db->quoteName('type') . ' ASC');
 
-		// [9033] Reset the query using our newly populated query object.
+		// [9034] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
 		$results = $db->loadColumn();
 
 		if ($results)
 		{
-			// [9041] get model
+			// [9042] get model
 			$model = $this->getModel();
 			$results = array_unique($results);
 			$filter = array();
 			foreach ($results as $type)
 			{
-				// [9052] Translate the type selection
+				// [9053] Translate the type selection
 				$text = $model->selectionTranslation($type,'type');
-				// [9054] Now add the type and its text to the options array
+				// [9055] Now add the type and its text to the options array
 				$filter[] = JHtml::_('select.option', $type, JText::_($text));
 			}
 			return $filter;
@@ -373,18 +373,18 @@ class CostbenefitprojectionViewInterventions extends JViewLegacy
 
 	protected function getTheCoverageSelections()
 	{
-		// [9025] Get a db connection.
+		// [9026] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [9027] Create a new query object.
+		// [9028] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [9029] Select the text.
+		// [9030] Select the text.
 		$query->select($db->quoteName('coverage'));
 		$query->from($db->quoteName('#__costbenefitprojection_intervention'));
 		$query->order($db->quoteName('coverage') . ' ASC');
 
-		// [9033] Reset the query using our newly populated query object.
+		// [9034] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
 		$results = $db->loadColumn();
@@ -395,7 +395,7 @@ class CostbenefitprojectionViewInterventions extends JViewLegacy
 			$filter = array();
 			foreach ($results as $coverage)
 			{
-				// [9059] Now add the coverage and its text to the options array
+				// [9060] Now add the coverage and its text to the options array
 				$filter[] = JHtml::_('select.option', $coverage, $coverage);
 			}
 			return $filter;
@@ -405,18 +405,18 @@ class CostbenefitprojectionViewInterventions extends JViewLegacy
 
 	protected function getTheDurationSelections()
 	{
-		// [9025] Get a db connection.
+		// [9026] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [9027] Create a new query object.
+		// [9028] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [9029] Select the text.
+		// [9030] Select the text.
 		$query->select($db->quoteName('duration'));
 		$query->from($db->quoteName('#__costbenefitprojection_intervention'));
 		$query->order($db->quoteName('duration') . ' ASC');
 
-		// [9033] Reset the query using our newly populated query object.
+		// [9034] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
 		$results = $db->loadColumn();
@@ -427,7 +427,7 @@ class CostbenefitprojectionViewInterventions extends JViewLegacy
 			$filter = array();
 			foreach ($results as $duration)
 			{
-				// [9059] Now add the duration and its text to the options array
+				// [9060] Now add the duration and its text to the options array
 				$filter[] = JHtml::_('select.option', $duration, $duration);
 			}
 			return $filter;
diff --git a/admin/views/scaling_factor/submitbutton.js b/admin/views/scaling_factor/submitbutton.js
index 88e146f1..45377919 100644
--- a/admin/views/scaling_factor/submitbutton.js
+++ b/admin/views/scaling_factor/submitbutton.js
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/scaling_factor/tmpl/edit.php b/admin/views/scaling_factor/tmpl/edit.php
index ace266ec..f19b5e40 100644
--- a/admin/views/scaling_factor/tmpl/edit.php
+++ b/admin/views/scaling_factor/tmpl/edit.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/scaling_factor/view.html.php b/admin/views/scaling_factor/view.html.php
index 7d25ffa3..b6b79ef1 100644
--- a/admin/views/scaling_factor/view.html.php
+++ b/admin/views/scaling_factor/view.html.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -86,27 +86,27 @@ class CostbenefitprojectionViewScaling_factor extends JViewLegacy
 		$isNew = $this->item->id == 0;
 
 		JToolbarHelper::title( JText::_($isNew ? 'COM_COSTBENEFITPROJECTION_SCALING_FACTOR_NEW' : 'COM_COSTBENEFITPROJECTION_SCALING_FACTOR_EDIT'), 'pencil-2 article-add');
-		// [10277] Built the actions for new and existing records.
+		// [10278] Built the actions for new and existing records.
 		if ($this->refid || $this->ref)
 		{
 			if ($this->canDo->get('scaling_factor.create') && $isNew)
 			{
-				// [10289] We can create the record.
+				// [10290] We can create the record.
 				JToolBarHelper::save('scaling_factor.save', 'JTOOLBAR_SAVE');
 			}
 			elseif ($this->canDo->get('scaling_factor.edit'))
 			{
-				// [10301] We can save the record.
+				// [10302] We can save the record.
 				JToolBarHelper::save('scaling_factor.save', 'JTOOLBAR_SAVE');
 			}
 			if ($isNew)
 			{
-				// [10306] Do not creat but cancel.
+				// [10307] Do not creat but cancel.
 				JToolBarHelper::cancel('scaling_factor.cancel', 'JTOOLBAR_CANCEL');
 			}
 			else
 			{
-				// [10311] We can close it.
+				// [10312] We can close it.
 				JToolBarHelper::cancel('scaling_factor.cancel', 'JTOOLBAR_CLOSE');
 			}
 		}
@@ -114,7 +114,7 @@ class CostbenefitprojectionViewScaling_factor extends JViewLegacy
 		{
 			if ($isNew)
 			{
-				// [10319] For new records, check the create permission.
+				// [10320] For new records, check the create permission.
 				if ($this->canDo->get('scaling_factor.create'))
 				{
 					JToolBarHelper::apply('scaling_factor.apply', 'JTOOLBAR_APPLY');
@@ -127,11 +127,11 @@ class CostbenefitprojectionViewScaling_factor extends JViewLegacy
 			{
 				if ($this->canDo->get('scaling_factor.edit'))
 				{
-					// [10346] We can save the new record
+					// [10347] We can save the new record
 					JToolBarHelper::apply('scaling_factor.apply', 'JTOOLBAR_APPLY');
 					JToolBarHelper::save('scaling_factor.save', 'JTOOLBAR_SAVE');
-					// [10349] We can save this record, but check the create permission to see
-					// [10350] if we can return to make a new one.
+					// [10350] We can save this record, but check the create permission to see
+					// [10351] if we can return to make a new one.
 					if ($this->canDo->get('scaling_factor.create'))
 					{
 						JToolBarHelper::custom('scaling_factor.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
@@ -150,7 +150,7 @@ class CostbenefitprojectionViewScaling_factor extends JViewLegacy
 			}
 		}
 		JToolbarHelper::divider();
-		// [10386] set help url for this view if found
+		// [10387] set help url for this view if found
 		$help_url = CostbenefitprojectionHelper::getHelpUrl('scaling_factor');
 		if (CostbenefitprojectionHelper::checkString($help_url))
 		{
diff --git a/admin/views/scaling_factors/tmpl/default.php b/admin/views/scaling_factors/tmpl/default.php
index 509df238..e6af7f6d 100644
--- a/admin/views/scaling_factors/tmpl/default.php
+++ b/admin/views/scaling_factors/tmpl/default.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/scaling_factors/tmpl/default_batch_body.php b/admin/views/scaling_factors/tmpl/default_batch_body.php
index 0e1ba1ef..e7929cb5 100644
--- a/admin/views/scaling_factors/tmpl/default_batch_body.php
+++ b/admin/views/scaling_factors/tmpl/default_batch_body.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/scaling_factors/tmpl/default_batch_footer.php b/admin/views/scaling_factors/tmpl/default_batch_footer.php
index da59d04d..77e72978 100644
--- a/admin/views/scaling_factors/tmpl/default_batch_footer.php
+++ b/admin/views/scaling_factors/tmpl/default_batch_footer.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/scaling_factors/tmpl/default_body.php b/admin/views/scaling_factors/tmpl/default_body.php
index d4894806..b3f4a53e 100644
--- a/admin/views/scaling_factors/tmpl/default_body.php
+++ b/admin/views/scaling_factors/tmpl/default_body.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/scaling_factors/tmpl/default_foot.php b/admin/views/scaling_factors/tmpl/default_foot.php
index 3e660761..e84ddca3 100644
--- a/admin/views/scaling_factors/tmpl/default_foot.php
+++ b/admin/views/scaling_factors/tmpl/default_foot.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/scaling_factors/tmpl/default_head.php b/admin/views/scaling_factors/tmpl/default_head.php
index 8bd734e3..23950196 100644
--- a/admin/views/scaling_factors/tmpl/default_head.php
+++ b/admin/views/scaling_factors/tmpl/default_head.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/scaling_factors/tmpl/default_toolbar.php b/admin/views/scaling_factors/tmpl/default_toolbar.php
index 2f23ae21..8fecf1e9 100644
--- a/admin/views/scaling_factors/tmpl/default_toolbar.php
+++ b/admin/views/scaling_factors/tmpl/default_toolbar.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/scaling_factors/view.html.php b/admin/views/scaling_factors/view.html.php
index 37be579a..cdd75247 100644
--- a/admin/views/scaling_factors/view.html.php
+++ b/admin/views/scaling_factors/view.html.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -196,11 +196,11 @@ class CostbenefitprojectionViewScaling_factors extends JViewLegacy
 			);
                 }  
 
-		// [9115] Set Causerisk Name Selection
+		// [9116] Set Causerisk Name Selection
 		$this->causeriskNameOptions = JFormHelper::loadFieldType('Causesrisks')->getOptions();
 		if ($this->causeriskNameOptions)
 		{
-			// [9119] Causerisk Name Filter
+			// [9120] Causerisk Name Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COSTBENEFITPROJECTION_SCALING_FACTOR_CAUSERISK_LABEL').' -',
 				'filter_causerisk',
@@ -209,7 +209,7 @@ class CostbenefitprojectionViewScaling_factors extends JViewLegacy
 
 			if ($this->canBatch && $this->canCreate && $this->canEdit)
 			{
-				// [9128] Causerisk Name Batch Selection
+				// [9129] Causerisk Name Batch Selection
 				JHtmlBatch_::addListSelection(
 					'- Keep Original '.JText::_('COM_COSTBENEFITPROJECTION_SCALING_FACTOR_CAUSERISK_LABEL').' -',
 					'batch[causerisk]',
@@ -218,11 +218,11 @@ class CostbenefitprojectionViewScaling_factors extends JViewLegacy
 			}
 		}
 
-		// [9115] Set Company Name Selection
+		// [9116] Set Company Name Selection
 		$this->companyNameOptions = JFormHelper::loadFieldType('Company')->getOptions();
 		if ($this->companyNameOptions)
 		{
-			// [9119] Company Name Filter
+			// [9120] Company Name Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COSTBENEFITPROJECTION_SCALING_FACTOR_COMPANY_LABEL').' -',
 				'filter_company',
@@ -231,7 +231,7 @@ class CostbenefitprojectionViewScaling_factors extends JViewLegacy
 
 			if ($this->canBatch && $this->canCreate && $this->canEdit)
 			{
-				// [9128] Company Name Batch Selection
+				// [9129] Company Name Batch Selection
 				JHtmlBatch_::addListSelection(
 					'- Keep Original '.JText::_('COM_COSTBENEFITPROJECTION_SCALING_FACTOR_COMPANY_LABEL').' -',
 					'batch[company]',
diff --git a/admin/views/service_provider/submitbutton.js b/admin/views/service_provider/submitbutton.js
index c648c2b6..bd5024f2 100644
--- a/admin/views/service_provider/submitbutton.js
+++ b/admin/views/service_provider/submitbutton.js
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/service_provider/tmpl/edit.php b/admin/views/service_provider/tmpl/edit.php
index 6a48cec1..5b7bb2b5 100644
--- a/admin/views/service_provider/tmpl/edit.php
+++ b/admin/views/service_provider/tmpl/edit.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/service_provider/view.html.php b/admin/views/service_provider/view.html.php
index e39f1af4..d3f5c28f 100644
--- a/admin/views/service_provider/view.html.php
+++ b/admin/views/service_provider/view.html.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -64,8 +64,8 @@ class CostbenefitprojectionViewService_provider extends JViewLegacy
                         $this->referral = '&ref='.(string)$this->ref;
                 }
 
-		// [6487] Get Linked view data
-		$this->qqtcompanies		= $this->get('Qqtcompanies');
+		// [6488] Get Linked view data
+		$this->zducompanies		= $this->get('Zducompanies');
 
 		// Set the toolbar
 		$this->addToolBar();
@@ -89,27 +89,27 @@ class CostbenefitprojectionViewService_provider extends JViewLegacy
 		$isNew = $this->item->id == 0;
 
 		JToolbarHelper::title( JText::_($isNew ? 'COM_COSTBENEFITPROJECTION_SERVICE_PROVIDER_NEW' : 'COM_COSTBENEFITPROJECTION_SERVICE_PROVIDER_EDIT'), 'pencil-2 article-add');
-		// [10277] Built the actions for new and existing records.
+		// [10278] Built the actions for new and existing records.
 		if ($this->refid || $this->ref)
 		{
 			if ($this->canDo->get('service_provider.create') && $isNew)
 			{
-				// [10289] We can create the record.
+				// [10290] We can create the record.
 				JToolBarHelper::save('service_provider.save', 'JTOOLBAR_SAVE');
 			}
 			elseif ($this->canDo->get('service_provider.edit'))
 			{
-				// [10301] We can save the record.
+				// [10302] We can save the record.
 				JToolBarHelper::save('service_provider.save', 'JTOOLBAR_SAVE');
 			}
 			if ($isNew)
 			{
-				// [10306] Do not creat but cancel.
+				// [10307] Do not creat but cancel.
 				JToolBarHelper::cancel('service_provider.cancel', 'JTOOLBAR_CANCEL');
 			}
 			else
 			{
-				// [10311] We can close it.
+				// [10312] We can close it.
 				JToolBarHelper::cancel('service_provider.cancel', 'JTOOLBAR_CLOSE');
 			}
 		}
@@ -117,7 +117,7 @@ class CostbenefitprojectionViewService_provider extends JViewLegacy
 		{
 			if ($isNew)
 			{
-				// [10319] For new records, check the create permission.
+				// [10320] For new records, check the create permission.
 				if ($this->canDo->get('service_provider.create'))
 				{
 					JToolBarHelper::apply('service_provider.apply', 'JTOOLBAR_APPLY');
@@ -130,11 +130,11 @@ class CostbenefitprojectionViewService_provider extends JViewLegacy
 			{
 				if ($this->canDo->get('service_provider.edit'))
 				{
-					// [10346] We can save the new record
+					// [10347] We can save the new record
 					JToolBarHelper::apply('service_provider.apply', 'JTOOLBAR_APPLY');
 					JToolBarHelper::save('service_provider.save', 'JTOOLBAR_SAVE');
-					// [10349] We can save this record, but check the create permission to see
-					// [10350] if we can return to make a new one.
+					// [10350] We can save this record, but check the create permission to see
+					// [10351] if we can return to make a new one.
 					if ($this->canDo->get('service_provider.create'))
 					{
 						JToolBarHelper::custom('service_provider.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
@@ -153,7 +153,7 @@ class CostbenefitprojectionViewService_provider extends JViewLegacy
 			}
 		}
 		JToolbarHelper::divider();
-		// [10386] set help url for this view if found
+		// [10387] set help url for this view if found
 		$help_url = CostbenefitprojectionHelper::getHelpUrl('service_provider');
 		if (CostbenefitprojectionHelper::checkString($help_url))
 		{
@@ -191,21 +191,21 @@ class CostbenefitprojectionViewService_provider extends JViewLegacy
 		$document->setTitle(JText::_($isNew ? 'COM_COSTBENEFITPROJECTION_SERVICE_PROVIDER_NEW' : 'COM_COSTBENEFITPROJECTION_SERVICE_PROVIDER_EDIT'));
 		$document->addStyleSheet(JURI::root() . "administrator/components/com_costbenefitprojection/assets/css/service_provider.css"); 
 
-		// [6522] Add the CSS for Footable.
+		// [6523] Add the CSS for Footable.
 		$document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable/css/footable.core.min.css');
 
-		// [6524] Use the Metro Style
+		// [6525] Use the Metro Style
 		if (!isset($this->fooTableStyle) || 0 == $this->fooTableStyle)
 		{
 			$document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable/css/footable.metro.min.css');
 		}
-		// [6529] Use the Legacy Style.
+		// [6530] Use the Legacy Style.
 		elseif (isset($this->fooTableStyle) && 1 == $this->fooTableStyle)
 		{
 			$document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable/css/footable.standalone.min.css');
 		}
 
-		// [6534] Add the JavaScript for Footable
+		// [6535] Add the JavaScript for Footable
 		$document->addScript(JURI::root() .'media/com_costbenefitprojection/footable/js/footable.js');
 		$document->addScript(JURI::root() .'media/com_costbenefitprojection/footable/js/footable.sort.js');
 		$document->addScript(JURI::root() .'media/com_costbenefitprojection/footable/js/footable.filter.js');
diff --git a/admin/views/service_providers/tmpl/default.php b/admin/views/service_providers/tmpl/default.php
index 4b222eec..a9f0b546 100644
--- a/admin/views/service_providers/tmpl/default.php
+++ b/admin/views/service_providers/tmpl/default.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/service_providers/tmpl/default_batch_body.php b/admin/views/service_providers/tmpl/default_batch_body.php
index 790cf1ed..0abbefb9 100644
--- a/admin/views/service_providers/tmpl/default_batch_body.php
+++ b/admin/views/service_providers/tmpl/default_batch_body.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/service_providers/tmpl/default_batch_footer.php b/admin/views/service_providers/tmpl/default_batch_footer.php
index 219237e9..9030ffbc 100644
--- a/admin/views/service_providers/tmpl/default_batch_footer.php
+++ b/admin/views/service_providers/tmpl/default_batch_footer.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/service_providers/tmpl/default_body.php b/admin/views/service_providers/tmpl/default_body.php
index f0439e11..cf92a070 100644
--- a/admin/views/service_providers/tmpl/default_body.php
+++ b/admin/views/service_providers/tmpl/default_body.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/service_providers/tmpl/default_foot.php b/admin/views/service_providers/tmpl/default_foot.php
index a586c5df..7f7a9426 100644
--- a/admin/views/service_providers/tmpl/default_foot.php
+++ b/admin/views/service_providers/tmpl/default_foot.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/service_providers/tmpl/default_head.php b/admin/views/service_providers/tmpl/default_head.php
index 92dee973..13153fc0 100644
--- a/admin/views/service_providers/tmpl/default_head.php
+++ b/admin/views/service_providers/tmpl/default_head.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/service_providers/tmpl/default_toolbar.php b/admin/views/service_providers/tmpl/default_toolbar.php
index 3f8bb350..0ba91ff1 100644
--- a/admin/views/service_providers/tmpl/default_toolbar.php
+++ b/admin/views/service_providers/tmpl/default_toolbar.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/admin/views/service_providers/view.html.php b/admin/views/service_providers/view.html.php
index ce6d8796..c37e1643 100644
--- a/admin/views/service_providers/view.html.php
+++ b/admin/views/service_providers/view.html.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -196,11 +196,11 @@ class CostbenefitprojectionViewService_providers extends JViewLegacy
 			);
                 }  
 
-		// [9115] Set Country Name Selection
+		// [9116] Set Country Name Selection
 		$this->countryNameOptions = JFormHelper::loadFieldType('Countries')->getOptions();
 		if ($this->countryNameOptions)
 		{
-			// [9119] Country Name Filter
+			// [9120] Country Name Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COSTBENEFITPROJECTION_SERVICE_PROVIDER_COUNTRY_LABEL').' -',
 				'filter_country',
@@ -209,7 +209,7 @@ class CostbenefitprojectionViewService_providers extends JViewLegacy
 
 			if ($this->canBatch && $this->canCreate && $this->canEdit)
 			{
-				// [9128] Country Name Batch Selection
+				// [9129] Country Name Batch Selection
 				JHtmlBatch_::addListSelection(
 					'- Keep Original '.JText::_('COM_COSTBENEFITPROJECTION_SERVICE_PROVIDER_COUNTRY_LABEL').' -',
 					'batch[country]',
diff --git a/costbenefitprojection.xml b/costbenefitprojection.xml
index 07d4dfe5..8e608e18 100644
--- a/costbenefitprojection.xml
+++ b/costbenefitprojection.xml
@@ -7,9 +7,9 @@
 	<authorUrl>http://www.vdm.io</authorUrl>
 	<copyright>Copyright (C) 2015. All Rights Reserved</copyright>
 	<license>GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html</license>
-	<version>3.0.8</version>
+	<version>3.0.9</version>
 	<description><![CDATA[
-		<h1>Cost Benefit Projection (v.3.0.8)</h1>
+		<h1>Cost Benefit Projection (v.3.0.9)</h1>
 		<div style="clear: both;"></div>
 		<p>[Create Epidemiological Profiles] (https://www.staffhealthcbp.com/) for diseases and risks affecting your company. Detailed information on projected work days lost and costs. Create and edit activities and wellness responses for your workplace. Access to Small Business Modelling. Results displayed by gender. Network with other companies and wellness professionals.
 
diff --git a/script.php b/script.php
index b51fdb2b..d10d6f79 100644
--- a/script.php
+++ b/script.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -47,794 +47,794 @@ class com_costbenefitprojectionInstallerScript
 	 */
 	function uninstall($parent)
 	{
-		// [4227] Get Application object
+		// [4228] Get Application object
 		$app = JFactory::getApplication();
 
-		// [4229] Get The Database object
+		// [4230] Get The Database object
 		$db = JFactory::getDbo();
 
-		// [4238] Create a new query object.
+		// [4239] Create a new query object.
 		$query = $db->getQuery(true);
-		// [4240] Select id from content type table
+		// [4241] Select id from content type table
 		$query->select($db->quoteName('type_id'));
 		$query->from($db->quoteName('#__content_types'));
-		// [4243] Where Company alias is found
+		// [4244] Where Company alias is found
 		$query->where( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.company') );
 		$db->setQuery($query);
-		// [4246] Execute query to see if alias is found
+		// [4247] Execute query to see if alias is found
 		$db->execute();
 		$company_found = $db->getNumRows();
-		// [4249] Now check if there were any rows
+		// [4250] Now check if there were any rows
 		if ($company_found)
 		{
-			// [4252] Since there are load the needed  company type ids
+			// [4253] Since there are load the needed  company type ids
 			$company_ids = $db->loadColumn();
-			// [4256] Remove Company from the content type table
+			// [4257] Remove Company from the content type table
 			$company_condition = array( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.company') );
-			// [4258] Create a new query object.
+			// [4259] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__content_types'));
 			$query->where($company_condition);
 			$db->setQuery($query);
-			// [4263] Execute the query to remove Company items
+			// [4264] Execute the query to remove Company items
 			$company_done = $db->execute();
 			if ($company_done);
 			{
-				// [4267] If succesfully remove Company add queued success message.
+				// [4268] If succesfully remove Company add queued success message.
 				$app->enqueueMessage(JText::_('The (com_costbenefitprojection.company) type alias was removed from the <b>#__content_type</b> table'));
 			}
 
-			// [4273] Remove Company items from the contentitem tag map table
+			// [4274] Remove Company items from the contentitem tag map table
 			$company_condition = array( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.company') );
-			// [4275] Create a new query object.
+			// [4276] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__contentitem_tag_map'));
 			$query->where($company_condition);
 			$db->setQuery($query);
-			// [4280] Execute the query to remove Company items
+			// [4281] Execute the query to remove Company items
 			$company_done = $db->execute();
 			if ($company_done);
 			{
-				// [4284] If succesfully remove Company add queued success message.
+				// [4285] If succesfully remove Company add queued success message.
 				$app->enqueueMessage(JText::_('The (com_costbenefitprojection.company) type alias was removed from the <b>#__contentitem_tag_map</b> table'));
 			}
 
-			// [4290] Remove Company items from the ucm content table
+			// [4291] Remove Company items from the ucm content table
 			$company_condition = array( $db->quoteName('core_type_alias') . ' = ' . $db->quote('com_costbenefitprojection.company') );
-			// [4292] Create a new query object.
+			// [4293] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__ucm_content'));
 			$query->where($company_condition);
 			$db->setQuery($query);
-			// [4297] Execute the query to remove Company items
+			// [4298] Execute the query to remove Company items
 			$company_done = $db->execute();
 			if ($company_done);
 			{
-				// [4301] If succesfully remove Company add queued success message.
+				// [4302] If succesfully remove Company add queued success message.
 				$app->enqueueMessage(JText::_('The (com_costbenefitprojection.company) type alias was removed from the <b>#__ucm_content</b> table'));
 			}
 
-			// [4307] Make sure that all the Company items are cleared from DB
+			// [4308] Make sure that all the Company items are cleared from DB
 			foreach ($company_ids as $company_id)
 			{
-				// [4312] Remove Company items from the ucm base table
+				// [4313] Remove Company items from the ucm base table
 				$company_condition = array( $db->quoteName('ucm_type_id') . ' = ' . $company_id);
-				// [4314] Create a new query object.
+				// [4315] Create a new query object.
 				$query = $db->getQuery(true);
 				$query->delete($db->quoteName('#__ucm_base'));
 				$query->where($company_condition);
 				$db->setQuery($query);
-				// [4319] Execute the query to remove Company items
+				// [4320] Execute the query to remove Company items
 				$db->execute();
 
-				// [4323] Remove Company items from the ucm history table
+				// [4324] Remove Company items from the ucm history table
 				$company_condition = array( $db->quoteName('ucm_type_id') . ' = ' . $company_id);
-				// [4325] Create a new query object.
+				// [4326] Create a new query object.
 				$query = $db->getQuery(true);
 				$query->delete($db->quoteName('#__ucm_history'));
 				$query->where($company_condition);
 				$db->setQuery($query);
-				// [4330] Execute the query to remove Company items
+				// [4331] Execute the query to remove Company items
 				$db->execute();
 			}
 		}
 
-		// [4238] Create a new query object.
+		// [4239] Create a new query object.
 		$query = $db->getQuery(true);
-		// [4240] Select id from content type table
+		// [4241] Select id from content type table
 		$query->select($db->quoteName('type_id'));
 		$query->from($db->quoteName('#__content_types'));
-		// [4243] Where Service_provider alias is found
+		// [4244] Where Service_provider alias is found
 		$query->where( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.service_provider') );
 		$db->setQuery($query);
-		// [4246] Execute query to see if alias is found
+		// [4247] Execute query to see if alias is found
 		$db->execute();
 		$service_provider_found = $db->getNumRows();
-		// [4249] Now check if there were any rows
+		// [4250] Now check if there were any rows
 		if ($service_provider_found)
 		{
-			// [4252] Since there are load the needed  service_provider type ids
+			// [4253] Since there are load the needed  service_provider type ids
 			$service_provider_ids = $db->loadColumn();
-			// [4256] Remove Service_provider from the content type table
+			// [4257] Remove Service_provider from the content type table
 			$service_provider_condition = array( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.service_provider') );
-			// [4258] Create a new query object.
+			// [4259] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__content_types'));
 			$query->where($service_provider_condition);
 			$db->setQuery($query);
-			// [4263] Execute the query to remove Service_provider items
+			// [4264] Execute the query to remove Service_provider items
 			$service_provider_done = $db->execute();
 			if ($service_provider_done);
 			{
-				// [4267] If succesfully remove Service_provider add queued success message.
+				// [4268] If succesfully remove Service_provider add queued success message.
 				$app->enqueueMessage(JText::_('The (com_costbenefitprojection.service_provider) type alias was removed from the <b>#__content_type</b> table'));
 			}
 
-			// [4273] Remove Service_provider items from the contentitem tag map table
+			// [4274] Remove Service_provider items from the contentitem tag map table
 			$service_provider_condition = array( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.service_provider') );
-			// [4275] Create a new query object.
+			// [4276] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__contentitem_tag_map'));
 			$query->where($service_provider_condition);
 			$db->setQuery($query);
-			// [4280] Execute the query to remove Service_provider items
+			// [4281] Execute the query to remove Service_provider items
 			$service_provider_done = $db->execute();
 			if ($service_provider_done);
 			{
-				// [4284] If succesfully remove Service_provider add queued success message.
+				// [4285] If succesfully remove Service_provider add queued success message.
 				$app->enqueueMessage(JText::_('The (com_costbenefitprojection.service_provider) type alias was removed from the <b>#__contentitem_tag_map</b> table'));
 			}
 
-			// [4290] Remove Service_provider items from the ucm content table
+			// [4291] Remove Service_provider items from the ucm content table
 			$service_provider_condition = array( $db->quoteName('core_type_alias') . ' = ' . $db->quote('com_costbenefitprojection.service_provider') );
-			// [4292] Create a new query object.
+			// [4293] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__ucm_content'));
 			$query->where($service_provider_condition);
 			$db->setQuery($query);
-			// [4297] Execute the query to remove Service_provider items
+			// [4298] Execute the query to remove Service_provider items
 			$service_provider_done = $db->execute();
 			if ($service_provider_done);
 			{
-				// [4301] If succesfully remove Service_provider add queued success message.
+				// [4302] If succesfully remove Service_provider add queued success message.
 				$app->enqueueMessage(JText::_('The (com_costbenefitprojection.service_provider) type alias was removed from the <b>#__ucm_content</b> table'));
 			}
 
-			// [4307] Make sure that all the Service_provider items are cleared from DB
+			// [4308] Make sure that all the Service_provider items are cleared from DB
 			foreach ($service_provider_ids as $service_provider_id)
 			{
-				// [4312] Remove Service_provider items from the ucm base table
+				// [4313] Remove Service_provider items from the ucm base table
 				$service_provider_condition = array( $db->quoteName('ucm_type_id') . ' = ' . $service_provider_id);
-				// [4314] Create a new query object.
+				// [4315] Create a new query object.
 				$query = $db->getQuery(true);
 				$query->delete($db->quoteName('#__ucm_base'));
 				$query->where($service_provider_condition);
 				$db->setQuery($query);
-				// [4319] Execute the query to remove Service_provider items
+				// [4320] Execute the query to remove Service_provider items
 				$db->execute();
 
-				// [4323] Remove Service_provider items from the ucm history table
+				// [4324] Remove Service_provider items from the ucm history table
 				$service_provider_condition = array( $db->quoteName('ucm_type_id') . ' = ' . $service_provider_id);
-				// [4325] Create a new query object.
+				// [4326] Create a new query object.
 				$query = $db->getQuery(true);
 				$query->delete($db->quoteName('#__ucm_history'));
 				$query->where($service_provider_condition);
 				$db->setQuery($query);
-				// [4330] Execute the query to remove Service_provider items
+				// [4331] Execute the query to remove Service_provider items
 				$db->execute();
 			}
 		}
 
-		// [4238] Create a new query object.
+		// [4239] Create a new query object.
 		$query = $db->getQuery(true);
-		// [4240] Select id from content type table
+		// [4241] Select id from content type table
 		$query->select($db->quoteName('type_id'));
 		$query->from($db->quoteName('#__content_types'));
-		// [4243] Where Country alias is found
+		// [4244] Where Country alias is found
 		$query->where( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.country') );
 		$db->setQuery($query);
-		// [4246] Execute query to see if alias is found
+		// [4247] Execute query to see if alias is found
 		$db->execute();
 		$country_found = $db->getNumRows();
-		// [4249] Now check if there were any rows
+		// [4250] Now check if there were any rows
 		if ($country_found)
 		{
-			// [4252] Since there are load the needed  country type ids
+			// [4253] Since there are load the needed  country type ids
 			$country_ids = $db->loadColumn();
-			// [4256] Remove Country from the content type table
+			// [4257] Remove Country from the content type table
 			$country_condition = array( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.country') );
-			// [4258] Create a new query object.
+			// [4259] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__content_types'));
 			$query->where($country_condition);
 			$db->setQuery($query);
-			// [4263] Execute the query to remove Country items
+			// [4264] Execute the query to remove Country items
 			$country_done = $db->execute();
 			if ($country_done);
 			{
-				// [4267] If succesfully remove Country add queued success message.
+				// [4268] If succesfully remove Country add queued success message.
 				$app->enqueueMessage(JText::_('The (com_costbenefitprojection.country) type alias was removed from the <b>#__content_type</b> table'));
 			}
 
-			// [4273] Remove Country items from the contentitem tag map table
+			// [4274] Remove Country items from the contentitem tag map table
 			$country_condition = array( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.country') );
-			// [4275] Create a new query object.
+			// [4276] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__contentitem_tag_map'));
 			$query->where($country_condition);
 			$db->setQuery($query);
-			// [4280] Execute the query to remove Country items
+			// [4281] Execute the query to remove Country items
 			$country_done = $db->execute();
 			if ($country_done);
 			{
-				// [4284] If succesfully remove Country add queued success message.
+				// [4285] If succesfully remove Country add queued success message.
 				$app->enqueueMessage(JText::_('The (com_costbenefitprojection.country) type alias was removed from the <b>#__contentitem_tag_map</b> table'));
 			}
 
-			// [4290] Remove Country items from the ucm content table
+			// [4291] Remove Country items from the ucm content table
 			$country_condition = array( $db->quoteName('core_type_alias') . ' = ' . $db->quote('com_costbenefitprojection.country') );
-			// [4292] Create a new query object.
+			// [4293] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__ucm_content'));
 			$query->where($country_condition);
 			$db->setQuery($query);
-			// [4297] Execute the query to remove Country items
+			// [4298] Execute the query to remove Country items
 			$country_done = $db->execute();
 			if ($country_done);
 			{
-				// [4301] If succesfully remove Country add queued success message.
+				// [4302] If succesfully remove Country add queued success message.
 				$app->enqueueMessage(JText::_('The (com_costbenefitprojection.country) type alias was removed from the <b>#__ucm_content</b> table'));
 			}
 
-			// [4307] Make sure that all the Country items are cleared from DB
+			// [4308] Make sure that all the Country items are cleared from DB
 			foreach ($country_ids as $country_id)
 			{
-				// [4312] Remove Country items from the ucm base table
+				// [4313] Remove Country items from the ucm base table
 				$country_condition = array( $db->quoteName('ucm_type_id') . ' = ' . $country_id);
-				// [4314] Create a new query object.
+				// [4315] Create a new query object.
 				$query = $db->getQuery(true);
 				$query->delete($db->quoteName('#__ucm_base'));
 				$query->where($country_condition);
 				$db->setQuery($query);
-				// [4319] Execute the query to remove Country items
+				// [4320] Execute the query to remove Country items
 				$db->execute();
 
-				// [4323] Remove Country items from the ucm history table
+				// [4324] Remove Country items from the ucm history table
 				$country_condition = array( $db->quoteName('ucm_type_id') . ' = ' . $country_id);
-				// [4325] Create a new query object.
+				// [4326] Create a new query object.
 				$query = $db->getQuery(true);
 				$query->delete($db->quoteName('#__ucm_history'));
 				$query->where($country_condition);
 				$db->setQuery($query);
-				// [4330] Execute the query to remove Country items
+				// [4331] Execute the query to remove Country items
 				$db->execute();
 			}
 		}
 
-		// [4238] Create a new query object.
+		// [4239] Create a new query object.
 		$query = $db->getQuery(true);
-		// [4240] Select id from content type table
+		// [4241] Select id from content type table
 		$query->select($db->quoteName('type_id'));
 		$query->from($db->quoteName('#__content_types'));
-		// [4243] Where Causerisk alias is found
+		// [4244] Where Causerisk alias is found
 		$query->where( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.causerisk') );
 		$db->setQuery($query);
-		// [4246] Execute query to see if alias is found
+		// [4247] Execute query to see if alias is found
 		$db->execute();
 		$causerisk_found = $db->getNumRows();
-		// [4249] Now check if there were any rows
+		// [4250] Now check if there were any rows
 		if ($causerisk_found)
 		{
-			// [4252] Since there are load the needed  causerisk type ids
+			// [4253] Since there are load the needed  causerisk type ids
 			$causerisk_ids = $db->loadColumn();
-			// [4256] Remove Causerisk from the content type table
+			// [4257] Remove Causerisk from the content type table
 			$causerisk_condition = array( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.causerisk') );
-			// [4258] Create a new query object.
+			// [4259] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__content_types'));
 			$query->where($causerisk_condition);
 			$db->setQuery($query);
-			// [4263] Execute the query to remove Causerisk items
+			// [4264] Execute the query to remove Causerisk items
 			$causerisk_done = $db->execute();
 			if ($causerisk_done);
 			{
-				// [4267] If succesfully remove Causerisk add queued success message.
+				// [4268] If succesfully remove Causerisk add queued success message.
 				$app->enqueueMessage(JText::_('The (com_costbenefitprojection.causerisk) type alias was removed from the <b>#__content_type</b> table'));
 			}
 
-			// [4273] Remove Causerisk items from the contentitem tag map table
+			// [4274] Remove Causerisk items from the contentitem tag map table
 			$causerisk_condition = array( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.causerisk') );
-			// [4275] Create a new query object.
+			// [4276] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__contentitem_tag_map'));
 			$query->where($causerisk_condition);
 			$db->setQuery($query);
-			// [4280] Execute the query to remove Causerisk items
+			// [4281] Execute the query to remove Causerisk items
 			$causerisk_done = $db->execute();
 			if ($causerisk_done);
 			{
-				// [4284] If succesfully remove Causerisk add queued success message.
+				// [4285] If succesfully remove Causerisk add queued success message.
 				$app->enqueueMessage(JText::_('The (com_costbenefitprojection.causerisk) type alias was removed from the <b>#__contentitem_tag_map</b> table'));
 			}
 
-			// [4290] Remove Causerisk items from the ucm content table
+			// [4291] Remove Causerisk items from the ucm content table
 			$causerisk_condition = array( $db->quoteName('core_type_alias') . ' = ' . $db->quote('com_costbenefitprojection.causerisk') );
-			// [4292] Create a new query object.
+			// [4293] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__ucm_content'));
 			$query->where($causerisk_condition);
 			$db->setQuery($query);
-			// [4297] Execute the query to remove Causerisk items
+			// [4298] Execute the query to remove Causerisk items
 			$causerisk_done = $db->execute();
 			if ($causerisk_done);
 			{
-				// [4301] If succesfully remove Causerisk add queued success message.
+				// [4302] If succesfully remove Causerisk add queued success message.
 				$app->enqueueMessage(JText::_('The (com_costbenefitprojection.causerisk) type alias was removed from the <b>#__ucm_content</b> table'));
 			}
 
-			// [4307] Make sure that all the Causerisk items are cleared from DB
+			// [4308] Make sure that all the Causerisk items are cleared from DB
 			foreach ($causerisk_ids as $causerisk_id)
 			{
-				// [4312] Remove Causerisk items from the ucm base table
+				// [4313] Remove Causerisk items from the ucm base table
 				$causerisk_condition = array( $db->quoteName('ucm_type_id') . ' = ' . $causerisk_id);
-				// [4314] Create a new query object.
+				// [4315] Create a new query object.
 				$query = $db->getQuery(true);
 				$query->delete($db->quoteName('#__ucm_base'));
 				$query->where($causerisk_condition);
 				$db->setQuery($query);
-				// [4319] Execute the query to remove Causerisk items
+				// [4320] Execute the query to remove Causerisk items
 				$db->execute();
 
-				// [4323] Remove Causerisk items from the ucm history table
+				// [4324] Remove Causerisk items from the ucm history table
 				$causerisk_condition = array( $db->quoteName('ucm_type_id') . ' = ' . $causerisk_id);
-				// [4325] Create a new query object.
+				// [4326] Create a new query object.
 				$query = $db->getQuery(true);
 				$query->delete($db->quoteName('#__ucm_history'));
 				$query->where($causerisk_condition);
 				$db->setQuery($query);
-				// [4330] Execute the query to remove Causerisk items
+				// [4331] Execute the query to remove Causerisk items
 				$db->execute();
 			}
 		}
 
-		// [4238] Create a new query object.
+		// [4239] Create a new query object.
 		$query = $db->getQuery(true);
-		// [4240] Select id from content type table
+		// [4241] Select id from content type table
 		$query->select($db->quoteName('type_id'));
 		$query->from($db->quoteName('#__content_types'));
-		// [4243] Where Health_data alias is found
+		// [4244] Where Health_data alias is found
 		$query->where( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.health_data') );
 		$db->setQuery($query);
-		// [4246] Execute query to see if alias is found
+		// [4247] Execute query to see if alias is found
 		$db->execute();
 		$health_data_found = $db->getNumRows();
-		// [4249] Now check if there were any rows
+		// [4250] Now check if there were any rows
 		if ($health_data_found)
 		{
-			// [4252] Since there are load the needed  health_data type ids
+			// [4253] Since there are load the needed  health_data type ids
 			$health_data_ids = $db->loadColumn();
-			// [4256] Remove Health_data from the content type table
+			// [4257] Remove Health_data from the content type table
 			$health_data_condition = array( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.health_data') );
-			// [4258] Create a new query object.
+			// [4259] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__content_types'));
 			$query->where($health_data_condition);
 			$db->setQuery($query);
-			// [4263] Execute the query to remove Health_data items
+			// [4264] Execute the query to remove Health_data items
 			$health_data_done = $db->execute();
 			if ($health_data_done);
 			{
-				// [4267] If succesfully remove Health_data add queued success message.
+				// [4268] If succesfully remove Health_data add queued success message.
 				$app->enqueueMessage(JText::_('The (com_costbenefitprojection.health_data) type alias was removed from the <b>#__content_type</b> table'));
 			}
 
-			// [4273] Remove Health_data items from the contentitem tag map table
+			// [4274] Remove Health_data items from the contentitem tag map table
 			$health_data_condition = array( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.health_data') );
-			// [4275] Create a new query object.
+			// [4276] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__contentitem_tag_map'));
 			$query->where($health_data_condition);
 			$db->setQuery($query);
-			// [4280] Execute the query to remove Health_data items
+			// [4281] Execute the query to remove Health_data items
 			$health_data_done = $db->execute();
 			if ($health_data_done);
 			{
-				// [4284] If succesfully remove Health_data add queued success message.
+				// [4285] If succesfully remove Health_data add queued success message.
 				$app->enqueueMessage(JText::_('The (com_costbenefitprojection.health_data) type alias was removed from the <b>#__contentitem_tag_map</b> table'));
 			}
 
-			// [4290] Remove Health_data items from the ucm content table
+			// [4291] Remove Health_data items from the ucm content table
 			$health_data_condition = array( $db->quoteName('core_type_alias') . ' = ' . $db->quote('com_costbenefitprojection.health_data') );
-			// [4292] Create a new query object.
+			// [4293] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__ucm_content'));
 			$query->where($health_data_condition);
 			$db->setQuery($query);
-			// [4297] Execute the query to remove Health_data items
+			// [4298] Execute the query to remove Health_data items
 			$health_data_done = $db->execute();
 			if ($health_data_done);
 			{
-				// [4301] If succesfully remove Health_data add queued success message.
+				// [4302] If succesfully remove Health_data add queued success message.
 				$app->enqueueMessage(JText::_('The (com_costbenefitprojection.health_data) type alias was removed from the <b>#__ucm_content</b> table'));
 			}
 
-			// [4307] Make sure that all the Health_data items are cleared from DB
+			// [4308] Make sure that all the Health_data items are cleared from DB
 			foreach ($health_data_ids as $health_data_id)
 			{
-				// [4312] Remove Health_data items from the ucm base table
+				// [4313] Remove Health_data items from the ucm base table
 				$health_data_condition = array( $db->quoteName('ucm_type_id') . ' = ' . $health_data_id);
-				// [4314] Create a new query object.
+				// [4315] Create a new query object.
 				$query = $db->getQuery(true);
 				$query->delete($db->quoteName('#__ucm_base'));
 				$query->where($health_data_condition);
 				$db->setQuery($query);
-				// [4319] Execute the query to remove Health_data items
+				// [4320] Execute the query to remove Health_data items
 				$db->execute();
 
-				// [4323] Remove Health_data items from the ucm history table
+				// [4324] Remove Health_data items from the ucm history table
 				$health_data_condition = array( $db->quoteName('ucm_type_id') . ' = ' . $health_data_id);
-				// [4325] Create a new query object.
+				// [4326] Create a new query object.
 				$query = $db->getQuery(true);
 				$query->delete($db->quoteName('#__ucm_history'));
 				$query->where($health_data_condition);
 				$db->setQuery($query);
-				// [4330] Execute the query to remove Health_data items
+				// [4331] Execute the query to remove Health_data items
 				$db->execute();
 			}
 		}
 
-		// [4238] Create a new query object.
+		// [4239] Create a new query object.
 		$query = $db->getQuery(true);
-		// [4240] Select id from content type table
+		// [4241] Select id from content type table
 		$query->select($db->quoteName('type_id'));
 		$query->from($db->quoteName('#__content_types'));
-		// [4243] Where Scaling_factor alias is found
+		// [4244] Where Scaling_factor alias is found
 		$query->where( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.scaling_factor') );
 		$db->setQuery($query);
-		// [4246] Execute query to see if alias is found
+		// [4247] Execute query to see if alias is found
 		$db->execute();
 		$scaling_factor_found = $db->getNumRows();
-		// [4249] Now check if there were any rows
+		// [4250] Now check if there were any rows
 		if ($scaling_factor_found)
 		{
-			// [4252] Since there are load the needed  scaling_factor type ids
+			// [4253] Since there are load the needed  scaling_factor type ids
 			$scaling_factor_ids = $db->loadColumn();
-			// [4256] Remove Scaling_factor from the content type table
+			// [4257] Remove Scaling_factor from the content type table
 			$scaling_factor_condition = array( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.scaling_factor') );
-			// [4258] Create a new query object.
+			// [4259] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__content_types'));
 			$query->where($scaling_factor_condition);
 			$db->setQuery($query);
-			// [4263] Execute the query to remove Scaling_factor items
+			// [4264] Execute the query to remove Scaling_factor items
 			$scaling_factor_done = $db->execute();
 			if ($scaling_factor_done);
 			{
-				// [4267] If succesfully remove Scaling_factor add queued success message.
+				// [4268] If succesfully remove Scaling_factor add queued success message.
 				$app->enqueueMessage(JText::_('The (com_costbenefitprojection.scaling_factor) type alias was removed from the <b>#__content_type</b> table'));
 			}
 
-			// [4273] Remove Scaling_factor items from the contentitem tag map table
+			// [4274] Remove Scaling_factor items from the contentitem tag map table
 			$scaling_factor_condition = array( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.scaling_factor') );
-			// [4275] Create a new query object.
+			// [4276] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__contentitem_tag_map'));
 			$query->where($scaling_factor_condition);
 			$db->setQuery($query);
-			// [4280] Execute the query to remove Scaling_factor items
+			// [4281] Execute the query to remove Scaling_factor items
 			$scaling_factor_done = $db->execute();
 			if ($scaling_factor_done);
 			{
-				// [4284] If succesfully remove Scaling_factor add queued success message.
+				// [4285] If succesfully remove Scaling_factor add queued success message.
 				$app->enqueueMessage(JText::_('The (com_costbenefitprojection.scaling_factor) type alias was removed from the <b>#__contentitem_tag_map</b> table'));
 			}
 
-			// [4290] Remove Scaling_factor items from the ucm content table
+			// [4291] Remove Scaling_factor items from the ucm content table
 			$scaling_factor_condition = array( $db->quoteName('core_type_alias') . ' = ' . $db->quote('com_costbenefitprojection.scaling_factor') );
-			// [4292] Create a new query object.
+			// [4293] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__ucm_content'));
 			$query->where($scaling_factor_condition);
 			$db->setQuery($query);
-			// [4297] Execute the query to remove Scaling_factor items
+			// [4298] Execute the query to remove Scaling_factor items
 			$scaling_factor_done = $db->execute();
 			if ($scaling_factor_done);
 			{
-				// [4301] If succesfully remove Scaling_factor add queued success message.
+				// [4302] If succesfully remove Scaling_factor add queued success message.
 				$app->enqueueMessage(JText::_('The (com_costbenefitprojection.scaling_factor) type alias was removed from the <b>#__ucm_content</b> table'));
 			}
 
-			// [4307] Make sure that all the Scaling_factor items are cleared from DB
+			// [4308] Make sure that all the Scaling_factor items are cleared from DB
 			foreach ($scaling_factor_ids as $scaling_factor_id)
 			{
-				// [4312] Remove Scaling_factor items from the ucm base table
+				// [4313] Remove Scaling_factor items from the ucm base table
 				$scaling_factor_condition = array( $db->quoteName('ucm_type_id') . ' = ' . $scaling_factor_id);
-				// [4314] Create a new query object.
+				// [4315] Create a new query object.
 				$query = $db->getQuery(true);
 				$query->delete($db->quoteName('#__ucm_base'));
 				$query->where($scaling_factor_condition);
 				$db->setQuery($query);
-				// [4319] Execute the query to remove Scaling_factor items
+				// [4320] Execute the query to remove Scaling_factor items
 				$db->execute();
 
-				// [4323] Remove Scaling_factor items from the ucm history table
+				// [4324] Remove Scaling_factor items from the ucm history table
 				$scaling_factor_condition = array( $db->quoteName('ucm_type_id') . ' = ' . $scaling_factor_id);
-				// [4325] Create a new query object.
+				// [4326] Create a new query object.
 				$query = $db->getQuery(true);
 				$query->delete($db->quoteName('#__ucm_history'));
 				$query->where($scaling_factor_condition);
 				$db->setQuery($query);
-				// [4330] Execute the query to remove Scaling_factor items
+				// [4331] Execute the query to remove Scaling_factor items
 				$db->execute();
 			}
 		}
 
-		// [4238] Create a new query object.
+		// [4239] Create a new query object.
 		$query = $db->getQuery(true);
-		// [4240] Select id from content type table
+		// [4241] Select id from content type table
 		$query->select($db->quoteName('type_id'));
 		$query->from($db->quoteName('#__content_types'));
-		// [4243] Where Intervention alias is found
+		// [4244] Where Intervention alias is found
 		$query->where( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.intervention') );
 		$db->setQuery($query);
-		// [4246] Execute query to see if alias is found
+		// [4247] Execute query to see if alias is found
 		$db->execute();
 		$intervention_found = $db->getNumRows();
-		// [4249] Now check if there were any rows
+		// [4250] Now check if there were any rows
 		if ($intervention_found)
 		{
-			// [4252] Since there are load the needed  intervention type ids
+			// [4253] Since there are load the needed  intervention type ids
 			$intervention_ids = $db->loadColumn();
-			// [4256] Remove Intervention from the content type table
+			// [4257] Remove Intervention from the content type table
 			$intervention_condition = array( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.intervention') );
-			// [4258] Create a new query object.
+			// [4259] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__content_types'));
 			$query->where($intervention_condition);
 			$db->setQuery($query);
-			// [4263] Execute the query to remove Intervention items
+			// [4264] Execute the query to remove Intervention items
 			$intervention_done = $db->execute();
 			if ($intervention_done);
 			{
-				// [4267] If succesfully remove Intervention add queued success message.
+				// [4268] If succesfully remove Intervention add queued success message.
 				$app->enqueueMessage(JText::_('The (com_costbenefitprojection.intervention) type alias was removed from the <b>#__content_type</b> table'));
 			}
 
-			// [4273] Remove Intervention items from the contentitem tag map table
+			// [4274] Remove Intervention items from the contentitem tag map table
 			$intervention_condition = array( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.intervention') );
-			// [4275] Create a new query object.
+			// [4276] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__contentitem_tag_map'));
 			$query->where($intervention_condition);
 			$db->setQuery($query);
-			// [4280] Execute the query to remove Intervention items
+			// [4281] Execute the query to remove Intervention items
 			$intervention_done = $db->execute();
 			if ($intervention_done);
 			{
-				// [4284] If succesfully remove Intervention add queued success message.
+				// [4285] If succesfully remove Intervention add queued success message.
 				$app->enqueueMessage(JText::_('The (com_costbenefitprojection.intervention) type alias was removed from the <b>#__contentitem_tag_map</b> table'));
 			}
 
-			// [4290] Remove Intervention items from the ucm content table
+			// [4291] Remove Intervention items from the ucm content table
 			$intervention_condition = array( $db->quoteName('core_type_alias') . ' = ' . $db->quote('com_costbenefitprojection.intervention') );
-			// [4292] Create a new query object.
+			// [4293] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__ucm_content'));
 			$query->where($intervention_condition);
 			$db->setQuery($query);
-			// [4297] Execute the query to remove Intervention items
+			// [4298] Execute the query to remove Intervention items
 			$intervention_done = $db->execute();
 			if ($intervention_done);
 			{
-				// [4301] If succesfully remove Intervention add queued success message.
+				// [4302] If succesfully remove Intervention add queued success message.
 				$app->enqueueMessage(JText::_('The (com_costbenefitprojection.intervention) type alias was removed from the <b>#__ucm_content</b> table'));
 			}
 
-			// [4307] Make sure that all the Intervention items are cleared from DB
+			// [4308] Make sure that all the Intervention items are cleared from DB
 			foreach ($intervention_ids as $intervention_id)
 			{
-				// [4312] Remove Intervention items from the ucm base table
+				// [4313] Remove Intervention items from the ucm base table
 				$intervention_condition = array( $db->quoteName('ucm_type_id') . ' = ' . $intervention_id);
-				// [4314] Create a new query object.
+				// [4315] Create a new query object.
 				$query = $db->getQuery(true);
 				$query->delete($db->quoteName('#__ucm_base'));
 				$query->where($intervention_condition);
 				$db->setQuery($query);
-				// [4319] Execute the query to remove Intervention items
+				// [4320] Execute the query to remove Intervention items
 				$db->execute();
 
-				// [4323] Remove Intervention items from the ucm history table
+				// [4324] Remove Intervention items from the ucm history table
 				$intervention_condition = array( $db->quoteName('ucm_type_id') . ' = ' . $intervention_id);
-				// [4325] Create a new query object.
+				// [4326] Create a new query object.
 				$query = $db->getQuery(true);
 				$query->delete($db->quoteName('#__ucm_history'));
 				$query->where($intervention_condition);
 				$db->setQuery($query);
-				// [4330] Execute the query to remove Intervention items
+				// [4331] Execute the query to remove Intervention items
 				$db->execute();
 			}
 		}
 
-		// [4238] Create a new query object.
+		// [4239] Create a new query object.
 		$query = $db->getQuery(true);
-		// [4240] Select id from content type table
+		// [4241] Select id from content type table
 		$query->select($db->quoteName('type_id'));
 		$query->from($db->quoteName('#__content_types'));
-		// [4243] Where Currency alias is found
+		// [4244] Where Currency alias is found
 		$query->where( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.currency') );
 		$db->setQuery($query);
-		// [4246] Execute query to see if alias is found
+		// [4247] Execute query to see if alias is found
 		$db->execute();
 		$currency_found = $db->getNumRows();
-		// [4249] Now check if there were any rows
+		// [4250] Now check if there were any rows
 		if ($currency_found)
 		{
-			// [4252] Since there are load the needed  currency type ids
+			// [4253] Since there are load the needed  currency type ids
 			$currency_ids = $db->loadColumn();
-			// [4256] Remove Currency from the content type table
+			// [4257] Remove Currency from the content type table
 			$currency_condition = array( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.currency') );
-			// [4258] Create a new query object.
+			// [4259] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__content_types'));
 			$query->where($currency_condition);
 			$db->setQuery($query);
-			// [4263] Execute the query to remove Currency items
+			// [4264] Execute the query to remove Currency items
 			$currency_done = $db->execute();
 			if ($currency_done);
 			{
-				// [4267] If succesfully remove Currency add queued success message.
+				// [4268] If succesfully remove Currency add queued success message.
 				$app->enqueueMessage(JText::_('The (com_costbenefitprojection.currency) type alias was removed from the <b>#__content_type</b> table'));
 			}
 
-			// [4273] Remove Currency items from the contentitem tag map table
+			// [4274] Remove Currency items from the contentitem tag map table
 			$currency_condition = array( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.currency') );
-			// [4275] Create a new query object.
+			// [4276] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__contentitem_tag_map'));
 			$query->where($currency_condition);
 			$db->setQuery($query);
-			// [4280] Execute the query to remove Currency items
+			// [4281] Execute the query to remove Currency items
 			$currency_done = $db->execute();
 			if ($currency_done);
 			{
-				// [4284] If succesfully remove Currency add queued success message.
+				// [4285] If succesfully remove Currency add queued success message.
 				$app->enqueueMessage(JText::_('The (com_costbenefitprojection.currency) type alias was removed from the <b>#__contentitem_tag_map</b> table'));
 			}
 
-			// [4290] Remove Currency items from the ucm content table
+			// [4291] Remove Currency items from the ucm content table
 			$currency_condition = array( $db->quoteName('core_type_alias') . ' = ' . $db->quote('com_costbenefitprojection.currency') );
-			// [4292] Create a new query object.
+			// [4293] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__ucm_content'));
 			$query->where($currency_condition);
 			$db->setQuery($query);
-			// [4297] Execute the query to remove Currency items
+			// [4298] Execute the query to remove Currency items
 			$currency_done = $db->execute();
 			if ($currency_done);
 			{
-				// [4301] If succesfully remove Currency add queued success message.
+				// [4302] If succesfully remove Currency add queued success message.
 				$app->enqueueMessage(JText::_('The (com_costbenefitprojection.currency) type alias was removed from the <b>#__ucm_content</b> table'));
 			}
 
-			// [4307] Make sure that all the Currency items are cleared from DB
+			// [4308] Make sure that all the Currency items are cleared from DB
 			foreach ($currency_ids as $currency_id)
 			{
-				// [4312] Remove Currency items from the ucm base table
+				// [4313] Remove Currency items from the ucm base table
 				$currency_condition = array( $db->quoteName('ucm_type_id') . ' = ' . $currency_id);
-				// [4314] Create a new query object.
+				// [4315] Create a new query object.
 				$query = $db->getQuery(true);
 				$query->delete($db->quoteName('#__ucm_base'));
 				$query->where($currency_condition);
 				$db->setQuery($query);
-				// [4319] Execute the query to remove Currency items
+				// [4320] Execute the query to remove Currency items
 				$db->execute();
 
-				// [4323] Remove Currency items from the ucm history table
+				// [4324] Remove Currency items from the ucm history table
 				$currency_condition = array( $db->quoteName('ucm_type_id') . ' = ' . $currency_id);
-				// [4325] Create a new query object.
+				// [4326] Create a new query object.
 				$query = $db->getQuery(true);
 				$query->delete($db->quoteName('#__ucm_history'));
 				$query->where($currency_condition);
 				$db->setQuery($query);
-				// [4330] Execute the query to remove Currency items
+				// [4331] Execute the query to remove Currency items
 				$db->execute();
 			}
 		}
 
-		// [4238] Create a new query object.
+		// [4239] Create a new query object.
 		$query = $db->getQuery(true);
-		// [4240] Select id from content type table
+		// [4241] Select id from content type table
 		$query->select($db->quoteName('type_id'));
 		$query->from($db->quoteName('#__content_types'));
-		// [4243] Where Help_document alias is found
+		// [4244] Where Help_document alias is found
 		$query->where( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.help_document') );
 		$db->setQuery($query);
-		// [4246] Execute query to see if alias is found
+		// [4247] Execute query to see if alias is found
 		$db->execute();
 		$help_document_found = $db->getNumRows();
-		// [4249] Now check if there were any rows
+		// [4250] Now check if there were any rows
 		if ($help_document_found)
 		{
-			// [4252] Since there are load the needed  help_document type ids
+			// [4253] Since there are load the needed  help_document type ids
 			$help_document_ids = $db->loadColumn();
-			// [4256] Remove Help_document from the content type table
+			// [4257] Remove Help_document from the content type table
 			$help_document_condition = array( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.help_document') );
-			// [4258] Create a new query object.
+			// [4259] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__content_types'));
 			$query->where($help_document_condition);
 			$db->setQuery($query);
-			// [4263] Execute the query to remove Help_document items
+			// [4264] Execute the query to remove Help_document items
 			$help_document_done = $db->execute();
 			if ($help_document_done);
 			{
-				// [4267] If succesfully remove Help_document add queued success message.
+				// [4268] If succesfully remove Help_document add queued success message.
 				$app->enqueueMessage(JText::_('The (com_costbenefitprojection.help_document) type alias was removed from the <b>#__content_type</b> table'));
 			}
 
-			// [4273] Remove Help_document items from the contentitem tag map table
+			// [4274] Remove Help_document items from the contentitem tag map table
 			$help_document_condition = array( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.help_document') );
-			// [4275] Create a new query object.
+			// [4276] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__contentitem_tag_map'));
 			$query->where($help_document_condition);
 			$db->setQuery($query);
-			// [4280] Execute the query to remove Help_document items
+			// [4281] Execute the query to remove Help_document items
 			$help_document_done = $db->execute();
 			if ($help_document_done);
 			{
-				// [4284] If succesfully remove Help_document add queued success message.
+				// [4285] If succesfully remove Help_document add queued success message.
 				$app->enqueueMessage(JText::_('The (com_costbenefitprojection.help_document) type alias was removed from the <b>#__contentitem_tag_map</b> table'));
 			}
 
-			// [4290] Remove Help_document items from the ucm content table
+			// [4291] Remove Help_document items from the ucm content table
 			$help_document_condition = array( $db->quoteName('core_type_alias') . ' = ' . $db->quote('com_costbenefitprojection.help_document') );
-			// [4292] Create a new query object.
+			// [4293] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__ucm_content'));
 			$query->where($help_document_condition);
 			$db->setQuery($query);
-			// [4297] Execute the query to remove Help_document items
+			// [4298] Execute the query to remove Help_document items
 			$help_document_done = $db->execute();
 			if ($help_document_done);
 			{
-				// [4301] If succesfully remove Help_document add queued success message.
+				// [4302] If succesfully remove Help_document add queued success message.
 				$app->enqueueMessage(JText::_('The (com_costbenefitprojection.help_document) type alias was removed from the <b>#__ucm_content</b> table'));
 			}
 
-			// [4307] Make sure that all the Help_document items are cleared from DB
+			// [4308] Make sure that all the Help_document items are cleared from DB
 			foreach ($help_document_ids as $help_document_id)
 			{
-				// [4312] Remove Help_document items from the ucm base table
+				// [4313] Remove Help_document items from the ucm base table
 				$help_document_condition = array( $db->quoteName('ucm_type_id') . ' = ' . $help_document_id);
-				// [4314] Create a new query object.
+				// [4315] Create a new query object.
 				$query = $db->getQuery(true);
 				$query->delete($db->quoteName('#__ucm_base'));
 				$query->where($help_document_condition);
 				$db->setQuery($query);
-				// [4319] Execute the query to remove Help_document items
+				// [4320] Execute the query to remove Help_document items
 				$db->execute();
 
-				// [4323] Remove Help_document items from the ucm history table
+				// [4324] Remove Help_document items from the ucm history table
 				$help_document_condition = array( $db->quoteName('ucm_type_id') . ' = ' . $help_document_id);
-				// [4325] Create a new query object.
+				// [4326] Create a new query object.
 				$query = $db->getQuery(true);
 				$query->delete($db->quoteName('#__ucm_history'));
 				$query->where($help_document_condition);
 				$db->setQuery($query);
-				// [4330] Execute the query to remove Help_document items
+				// [4331] Execute the query to remove Help_document items
 				$db->execute();
 			}
 		}
 
-		// [4338] If All related items was removed queued success message.
+		// [4339] If All related items was removed queued success message.
 		$app->enqueueMessage(JText::_('All related items was removed from the <b>#__ucm_base</b> table'));
 		$app->enqueueMessage(JText::_('All related items was removed from the <b>#__ucm_history</b> table'));
 
-		// [4343] Remove costbenefitprojection assets from the assets table
+		// [4344] Remove costbenefitprojection assets from the assets table
 		$costbenefitprojection_condition = array( $db->quoteName('name') . ' LIKE ' . $db->quote('com_costbenefitprojection%') );
 
-		// [4345] Create a new query object.
+		// [4346] Create a new query object.
 		$query = $db->getQuery(true);
 		$query->delete($db->quoteName('#__assets'));
 		$query->where($costbenefitprojection_condition);
@@ -842,7 +842,7 @@ class com_costbenefitprojectionInstallerScript
 		$help_document_done = $db->execute();
 		if ($help_document_done);
 		{
-			// [4353] If succesfully remove costbenefitprojection add queued success message.
+			// [4354] If succesfully remove costbenefitprojection add queued success message.
 			$app->enqueueMessage(JText::_('All related items was removed from the <b>#__assets</b> table'));
 		}
 
@@ -896,11 +896,11 @@ class com_costbenefitprojectionInstallerScript
 		if ($type == 'install')
 		{
 
-			// [4399] Get The Database object
+			// [4400] Get The Database object
 
 			$db = JFactory::getDbo();
 
-			// [4406] Create the company content type object.
+			// [4407] Create the company content type object.
 			$company = new stdClass();
 			$company->type_title = 'Costbenefitprojection Company';
 			$company->type_alias = 'com_costbenefitprojection.company';
@@ -909,10 +909,10 @@ class com_costbenefitprojectionInstallerScript
 			$company->router = 'CostbenefitprojectionHelperRoute::getCompanyRoute';
 			$company->content_history_options = '{"formFile": "administrator/components/com_costbenefitprojection/models/forms/company.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","user","department","country","serviceprovider","per","working_days","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "user","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "country","targetTable": "#__costbenefitprojection_country","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "serviceprovider","targetTable": "#__costbenefitprojection_service_provider","targetColumn": "id","displayColumn": "user"},{"sourceColumn": "causesrisks","targetTable": "#__costbenefitprojection_causerisk","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "datayear","targetTable": "#__costbenefitprojection_health_data","targetColumn": "year","displayColumn": "country"}]}';
 
-			// [4412] Insert the object into the content types table.
+			// [4413] Insert the object into the content types table.
 			$companyInserted = $db->insertObject('#__content_types', $company);
 
-			// [4406] Create the service_provider content type object.
+			// [4407] Create the service_provider content type object.
 			$service_provider = new stdClass();
 			$service_provider->type_title = 'Costbenefitprojection Service_provider';
 			$service_provider->type_alias = 'com_costbenefitprojection.service_provider';
@@ -921,10 +921,10 @@ class com_costbenefitprojectionInstallerScript
 			$service_provider->router = 'CostbenefitprojectionHelperRoute::getService_providerRoute';
 			$service_provider->content_history_options = '{"formFile": "administrator/components/com_costbenefitprojection/models/forms/service_provider.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","user","country"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "user","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "country","targetTable": "#__costbenefitprojection_country","targetColumn": "id","displayColumn": "name"}]}';
 
-			// [4412] Insert the object into the content types table.
+			// [4413] Insert the object into the content types table.
 			$service_providerInserted = $db->insertObject('#__content_types', $service_provider);
 
-			// [4406] Create the country content type object.
+			// [4407] Create the country content type object.
 			$country = new stdClass();
 			$country->type_title = 'Costbenefitprojection Country';
 			$country->type_alias = 'com_costbenefitprojection.country';
@@ -933,10 +933,10 @@ class com_costbenefitprojectionInstallerScript
 			$country->router = 'CostbenefitprojectionHelperRoute::getCountryRoute';
 			$country->content_history_options = '{"formFile": "administrator/components/com_costbenefitprojection/models/forms/country.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","user","working_days"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "user","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "currency","targetTable": "#__costbenefitprojection_currency","targetColumn": "codethree","displayColumn": "name"},{"sourceColumn": "datayear","targetTable": "#__costbenefitprojection_health_data","targetColumn": "year","displayColumn": "country"},{"sourceColumn": "causesrisks","targetTable": "#__costbenefitprojection_causerisk","targetColumn": "id","displayColumn": "name"}]}';
 
-			// [4412] Insert the object into the content types table.
+			// [4413] Insert the object into the content types table.
 			$countryInserted = $db->insertObject('#__content_types', $country);
 
-			// [4406] Create the causerisk content type object.
+			// [4407] Create the causerisk content type object.
 			$causerisk = new stdClass();
 			$causerisk->type_title = 'Costbenefitprojection Causerisk';
 			$causerisk->type_alias = 'com_costbenefitprojection.causerisk';
@@ -945,10 +945,10 @@ class com_costbenefitprojectionInstallerScript
 			$causerisk->router = 'CostbenefitprojectionHelperRoute::getCauseriskRoute';
 			$causerisk->content_history_options = '{"formFile": "administrator/components/com_costbenefitprojection/models/forms/causerisk.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"}]}';
 
-			// [4412] Insert the object into the content types table.
+			// [4413] Insert the object into the content types table.
 			$causeriskInserted = $db->insertObject('#__content_types', $causerisk);
 
-			// [4406] Create the health_data content type object.
+			// [4407] Create the health_data content type object.
 			$health_data = new stdClass();
 			$health_data->type_title = 'Costbenefitprojection Health_data';
 			$health_data->type_alias = 'com_costbenefitprojection.health_data';
@@ -957,10 +957,10 @@ class com_costbenefitprojectionInstallerScript
 			$health_data->router = 'CostbenefitprojectionHelperRoute::getHealth_dataRoute';
 			$health_data->content_history_options = '{"formFile": "administrator/components/com_costbenefitprojection/models/forms/health_data.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","causerisk","country"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "causerisk","targetTable": "#__costbenefitprojection_causerisk","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "country","targetTable": "#__costbenefitprojection_country","targetColumn": "id","displayColumn": "name"}]}';
 
-			// [4412] Insert the object into the content types table.
+			// [4413] Insert the object into the content types table.
 			$health_dataInserted = $db->insertObject('#__content_types', $health_data);
 
-			// [4406] Create the scaling_factor content type object.
+			// [4407] Create the scaling_factor content type object.
 			$scaling_factor = new stdClass();
 			$scaling_factor->type_title = 'Costbenefitprojection Scaling_factor';
 			$scaling_factor->type_alias = 'com_costbenefitprojection.scaling_factor';
@@ -969,10 +969,10 @@ class com_costbenefitprojectionInstallerScript
 			$scaling_factor->router = 'CostbenefitprojectionHelperRoute::getScaling_factorRoute';
 			$scaling_factor->content_history_options = '{"formFile": "administrator/components/com_costbenefitprojection/models/forms/scaling_factor.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","causerisk","company"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "causerisk","targetTable": "#__costbenefitprojection_causerisk","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "company","targetTable": "#__costbenefitprojection_company","targetColumn": "id","displayColumn": "name"}]}';
 
-			// [4412] Insert the object into the content types table.
+			// [4413] Insert the object into the content types table.
 			$scaling_factorInserted = $db->insertObject('#__content_types', $scaling_factor);
 
-			// [4406] Create the intervention content type object.
+			// [4407] Create the intervention content type object.
 			$intervention = new stdClass();
 			$intervention->type_title = 'Costbenefitprojection Intervention';
 			$intervention->type_alias = 'com_costbenefitprojection.intervention';
@@ -981,10 +981,10 @@ class com_costbenefitprojectionInstallerScript
 			$intervention->router = 'CostbenefitprojectionHelperRoute::getInterventionRoute';
 			$intervention->content_history_options = '{"formFile": "administrator/components/com_costbenefitprojection/models/forms/intervention.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","company","type","coverage","duration","share","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "company","targetTable": "#__costbenefitprojection_company","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "interventions","targetTable": "#__costbenefitprojection_intervention","targetColumn": "id","displayColumn": "name"}]}';
 
-			// [4412] Insert the object into the content types table.
+			// [4413] Insert the object into the content types table.
 			$interventionInserted = $db->insertObject('#__content_types', $intervention);
 
-			// [4406] Create the currency content type object.
+			// [4407] Create the currency content type object.
 			$currency = new stdClass();
 			$currency->type_title = 'Costbenefitprojection Currency';
 			$currency->type_alias = 'com_costbenefitprojection.currency';
@@ -993,10 +993,10 @@ class com_costbenefitprojectionInstallerScript
 			$currency->router = 'CostbenefitprojectionHelperRoute::getCurrencyRoute';
 			$currency->content_history_options = '{"formFile": "administrator/components/com_costbenefitprojection/models/forms/currency.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","numericcode","decimalplace"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"}]}';
 
-			// [4412] Insert the object into the content types table.
+			// [4413] Insert the object into the content types table.
 			$currencyInserted = $db->insertObject('#__content_types', $currency);
 
-			// [4406] Create the help_document content type object.
+			// [4407] Create the help_document content type object.
 			$help_document = new stdClass();
 			$help_document->type_title = 'Costbenefitprojection Help_document';
 			$help_document->type_alias = 'com_costbenefitprojection.help_document';
@@ -1005,19 +1005,19 @@ class com_costbenefitprojectionInstallerScript
 			$help_document->router = 'CostbenefitprojectionHelperRoute::getHelp_documentRoute';
 			$help_document->content_history_options = '{"formFile": "administrator/components/com_costbenefitprojection/models/forms/help_document.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","type","location","target","article","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "article","targetTable": "#__content","targetColumn": "id","displayColumn": "title"}]}';
 
-			// [4412] Insert the object into the content types table.
+			// [4413] Insert the object into the content types table.
 			$help_documentInserted = $db->insertObject('#__content_types', $help_document);
 
 
-			// [4424] Install the global extenstion params.
+			// [4425] Install the global extenstion params.
 			$query = $db->getQuery(true);
 
-			// [4432] Field to update.
+			// [4433] Field to update.
 			$fields = array(
 				$db->quoteName('params') . ' = ' . $db->quote('{"autorName":"Llewellyn van der Merwe","autorEmail":"llewellyn@vdm.io","check_in":"-1 day","save_history":"1","history_limit":"10","titleContributor1":"Health Economist","nameContributor1":"Patrick Hanlon, M.Sc. PH","emailContributor1":"Patrick.Hanlon@unibas.ch","linkContributor1":"http://www.swisstph.ch/about-us/staff/detailview.html?tx_x4epersdb_pi1[showUid]=2267&amp;cHash=1b1c5db0808e04d3f1afe0f3a3f67998","useContributor1":"2","showContributor1":"3","titleContributor2":"Development Advisor","nameContributor2":"Matthew Black","emailContributor2":"matthew.black@giz.de","linkContributor2":"http://www.giz.de","useContributor2":"2","showContributor2":"3","titleContributor3":"Associate Expert","nameContributor3":"Dr. Pascal Geldsetzer","emailContributor3":"pascal.geldsetzer@giz.de","linkContributor3":"http://www.giz.de","useContributor3":"2","showContributor3":"1","memberuser":["2"],"serviceprovideruser":["2"],"countryuser":["2"],"uikit_load":"1","uikit_min":"","uikit_style":"","admin_chartbackground":"#F7F7FA","admin_mainwidth":"1000","admin_chartareatop":"20","admin_chartarealeft":"20","admin_chartareawidth":"170","admin_legendtextstylefontcolor":"10","admin_legendtextstylefontsize":"20","admin_vaxistextstylefontcolor":"#63B1F2","admin_haxistextstylefontcolor":"#63B1F2","admin_haxistitletextstylefontcolor":"#63B1F2","site_chartbackground":"#F7F7FA","site_mainwidth":"1000","site_chartareatop":"20","site_chartarealeft":"20","site_chartareawidth":"170","site_legendtextstylefontcolor":"10","site_legendtextstylefontsize":"20","site_vaxistextstylefontcolor":"#63B1F2","site_haxistextstylefontcolor":"#63B1F2","site_haxistitletextstylefontcolor":"#63B1F2"}'),
 			);
 
-			// [4436] Condition.
+			// [4437] Condition.
 			$conditions = array(
 				$db->quoteName('element') . ' = ' . $db->quote('com_costbenefitprojection')
 			);
@@ -1035,7 +1035,7 @@ class com_costbenefitprojectionInstallerScript
 			echo '<a target="_blank" href="http://www.vdm.io" title="Cost Benefit Projection">
 				<img src="components/com_costbenefitprojection/assets/images/component-300.jpg"/>
 				</a>
-				<h3>Upgrade to Version (3.0.8) Was Successful!</h3>';
+				<h3>Upgrade to Version (3.0.9) Was Successful!</h3>';
 		}
 	}
 }
diff --git a/site/assets/css/combinedresults.css b/site/assets/css/combinedresults.css
index fe50457d..64d6d1ca 100644
--- a/site/assets/css/combinedresults.css
+++ b/site/assets/css/combinedresults.css
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/assets/css/company.css b/site/assets/css/company.css
index c2a29a98..5caf8a77 100644
--- a/site/assets/css/company.css
+++ b/site/assets/css/company.css
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/assets/css/companyresults.css b/site/assets/css/companyresults.css
index 44f6e191..f09e2041 100644
--- a/site/assets/css/companyresults.css
+++ b/site/assets/css/companyresults.css
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/assets/css/cpanel.css b/site/assets/css/cpanel.css
index 8ca4e4cb..4619e629 100644
--- a/site/assets/css/cpanel.css
+++ b/site/assets/css/cpanel.css
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/assets/css/createaccount.css b/site/assets/css/createaccount.css
index 62728cc5..90832fef 100644
--- a/site/assets/css/createaccount.css
+++ b/site/assets/css/createaccount.css
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/assets/css/intervention.css b/site/assets/css/intervention.css
index 70dcbe13..0fe432c3 100644
--- a/site/assets/css/intervention.css
+++ b/site/assets/css/intervention.css
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/assets/css/scaling_factor.css b/site/assets/css/scaling_factor.css
index daba4481..70f6e3b0 100644
--- a/site/assets/css/scaling_factor.css
+++ b/site/assets/css/scaling_factor.css
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/assets/css/site.css b/site/assets/css/site.css
index f3b7ac06..ef7794db 100644
--- a/site/assets/css/site.css
+++ b/site/assets/css/site.css
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/controller.php b/site/controller.php
index d5be042e..ffaa6fde 100644
--- a/site/controller.php
+++ b/site/controller.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/controllers/ajax.json.php b/site/controllers/ajax.json.php
index d901158d..dfa9abaf 100644
--- a/site/controllers/ajax.json.php
+++ b/site/controllers/ajax.json.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/controllers/company.php b/site/controllers/company.php
index 8bc466a1..aba2c0b8 100644
--- a/site/controllers/company.php
+++ b/site/controllers/company.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -54,13 +54,13 @@ class CostbenefitprojectionControllerCompany extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
-		// [9327] Access check.
+		// [9328] Access check.
 		$access = JFactory::getUser()->authorise('company.access', 'com_costbenefitprojection');
 		if (!$access)
 		{
 			return false;
 		}
-		// [9338] In the absense of better information, revert to the component permissions.
+		// [9339] In the absense of better information, revert to the component permissions.
 		return JFactory::getUser()->authorise('company.create', $this->option);
 	}
 
@@ -76,9 +76,9 @@ class CostbenefitprojectionControllerCompany extends JControllerForm
 	 */
 	protected function allowEdit($data = array(), $key = 'id')
 	{
-		// [9481] get user object.
+		// [9482] get user object.
 		$user		= JFactory::getUser();
-		// [9483] get record id.
+		// [9484] get record id.
 		$recordId	= (int) isset($data[$key]) ? $data[$key] : 0;
 		if (!$user->authorise('core.options', 'com_costbenefitprojection'))
 		{
@@ -97,7 +97,7 @@ class CostbenefitprojectionControllerCompany extends JControllerForm
 			return false;
 		}
 
-		// [9490] Access check.
+		// [9491] Access check.
 		$access = ($user->authorise('company.access', 'com_costbenefitprojection.company.' . (int) $recordId) &&  $user->authorise('company.access', 'com_costbenefitprojection'));
 		if (!$access)
 		{
@@ -106,17 +106,17 @@ class CostbenefitprojectionControllerCompany extends JControllerForm
 
 		if ($recordId)
 		{
-			// [9499] The record has been set. Check the record permissions.
+			// [9500] The record has been set. Check the record permissions.
 			$permission = $user->authorise('company.edit', 'com_costbenefitprojection.company.' . (int) $recordId);
 			if (!$permission && !is_null($permission))
 			{
 				if ($user->authorise('company.edit.own', 'com_costbenefitprojection.company.' . $recordId))
 				{
-					// [9521] Now test the owner is the user.
+					// [9522] Now test the owner is the user.
 					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
 					if (empty($ownerId))
 					{
-						// [9525] Need to do a lookup from the model.
+						// [9526] Need to do a lookup from the model.
 						$record = $this->getModel()->getItem($recordId);
 
 						if (empty($record))
@@ -126,7 +126,7 @@ class CostbenefitprojectionControllerCompany extends JControllerForm
 						$ownerId = $record->created_by;
 					}
 
-					// [9533] If the owner matches 'me' then allow.
+					// [9534] If the owner matches 'me' then allow.
 					if ($ownerId == $user->id)
 					{
 						if ($user->authorise('company.edit.own', 'com_costbenefitprojection'))
@@ -138,7 +138,7 @@ class CostbenefitprojectionControllerCompany extends JControllerForm
 				return false;
 			}
 		}
-		// [9555] Since there is no permission, revert to the component permissions.
+		// [9556] Since there is no permission, revert to the component permissions.
 		return $user->authorise('company.edit', $this->option);
 	}
 
diff --git a/site/controllers/help.php b/site/controllers/help.php
index 1352d75d..381f7202 100644
--- a/site/controllers/help.php
+++ b/site/controllers/help.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/controllers/intervention.php b/site/controllers/intervention.php
index 0a3d3ce9..c1b44c74 100644
--- a/site/controllers/intervention.php
+++ b/site/controllers/intervention.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -54,13 +54,13 @@ class CostbenefitprojectionControllerIntervention extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
-		// [9327] Access check.
+		// [9328] Access check.
 		$access = JFactory::getUser()->authorise('intervention.access', 'com_costbenefitprojection');
 		if (!$access)
 		{
 			return false;
 		}
-		// [9338] In the absense of better information, revert to the component permissions.
+		// [9339] In the absense of better information, revert to the component permissions.
 		return JFactory::getUser()->authorise('intervention.create', $this->option);
 	}
 
@@ -76,9 +76,9 @@ class CostbenefitprojectionControllerIntervention extends JControllerForm
 	 */
 	protected function allowEdit($data = array(), $key = 'id')
 	{
-		// [9481] get user object.
+		// [9482] get user object.
 		$user		= JFactory::getUser();
-		// [9483] get record id.
+		// [9484] get record id.
 		$recordId	= (int) isset($data[$key]) ? $data[$key] : 0;
 		// get company id
 		$company = CostbenefitprojectionHelper::getId('intervention',$recordId,'id','company');
@@ -97,7 +97,7 @@ class CostbenefitprojectionControllerIntervention extends JControllerForm
 			return false;
 		}
 
-		// [9490] Access check.
+		// [9491] Access check.
 		$access = ($user->authorise('intervention.access', 'com_costbenefitprojection.intervention.' . (int) $recordId) &&  $user->authorise('intervention.access', 'com_costbenefitprojection'));
 		if (!$access)
 		{
@@ -106,17 +106,17 @@ class CostbenefitprojectionControllerIntervention extends JControllerForm
 
 		if ($recordId)
 		{
-			// [9499] The record has been set. Check the record permissions.
+			// [9500] The record has been set. Check the record permissions.
 			$permission = $user->authorise('intervention.edit', 'com_costbenefitprojection.intervention.' . (int) $recordId);
 			if (!$permission && !is_null($permission))
 			{
 				if ($user->authorise('intervention.edit.own', 'com_costbenefitprojection.intervention.' . $recordId))
 				{
-					// [9521] Now test the owner is the user.
+					// [9522] Now test the owner is the user.
 					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
 					if (empty($ownerId))
 					{
-						// [9525] Need to do a lookup from the model.
+						// [9526] Need to do a lookup from the model.
 						$record = $this->getModel()->getItem($recordId);
 
 						if (empty($record))
@@ -126,7 +126,7 @@ class CostbenefitprojectionControllerIntervention extends JControllerForm
 						$ownerId = $record->created_by;
 					}
 
-					// [9533] If the owner matches 'me' then allow.
+					// [9534] If the owner matches 'me' then allow.
 					if ($ownerId == $user->id)
 					{
 						if ($user->authorise('intervention.edit.own', 'com_costbenefitprojection'))
@@ -138,7 +138,7 @@ class CostbenefitprojectionControllerIntervention extends JControllerForm
 				return false;
 			}
 		}
-		// [9555] Since there is no permission, revert to the component permissions.
+		// [9556] Since there is no permission, revert to the component permissions.
 		return $user->authorise('intervention.edit', $this->option);
 	}
 
diff --git a/site/controllers/scaling_factor.php b/site/controllers/scaling_factor.php
index 35442b78..14c7100a 100644
--- a/site/controllers/scaling_factor.php
+++ b/site/controllers/scaling_factor.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -54,13 +54,13 @@ class CostbenefitprojectionControllerScaling_factor extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
-		// [9327] Access check.
+		// [9328] Access check.
 		$access = JFactory::getUser()->authorise('scaling_factor.access', 'com_costbenefitprojection');
 		if (!$access)
 		{
 			return false;
 		}
-		// [9338] In the absense of better information, revert to the component permissions.
+		// [9339] In the absense of better information, revert to the component permissions.
 		return JFactory::getUser()->authorise('scaling_factor.create', $this->option);
 	}
 
@@ -76,9 +76,9 @@ class CostbenefitprojectionControllerScaling_factor extends JControllerForm
 	 */
 	protected function allowEdit($data = array(), $key = 'id')
 	{
-		// [9481] get user object.
+		// [9482] get user object.
 		$user		= JFactory::getUser();
-		// [9483] get record id.
+		// [9484] get record id.
 		$recordId	= (int) isset($data[$key]) ? $data[$key] : 0;
 		if (!$user->authorise('core.options', 'com_costbenefitprojection'))
 		{
@@ -91,7 +91,7 @@ class CostbenefitprojectionControllerScaling_factor extends JControllerForm
 			}
 		}
 
-		// [9490] Access check.
+		// [9491] Access check.
 		$access = ($user->authorise('scaling_factor.access', 'com_costbenefitprojection.scaling_factor.' . (int) $recordId) &&  $user->authorise('scaling_factor.access', 'com_costbenefitprojection'));
 		if (!$access)
 		{
@@ -100,17 +100,17 @@ class CostbenefitprojectionControllerScaling_factor extends JControllerForm
 
 		if ($recordId)
 		{
-			// [9499] The record has been set. Check the record permissions.
+			// [9500] The record has been set. Check the record permissions.
 			$permission = $user->authorise('scaling_factor.edit', 'com_costbenefitprojection.scaling_factor.' . (int) $recordId);
 			if (!$permission && !is_null($permission))
 			{
 				if ($user->authorise('scaling_factor.edit.own', 'com_costbenefitprojection.scaling_factor.' . $recordId))
 				{
-					// [9521] Now test the owner is the user.
+					// [9522] Now test the owner is the user.
 					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
 					if (empty($ownerId))
 					{
-						// [9525] Need to do a lookup from the model.
+						// [9526] Need to do a lookup from the model.
 						$record = $this->getModel()->getItem($recordId);
 
 						if (empty($record))
@@ -120,7 +120,7 @@ class CostbenefitprojectionControllerScaling_factor extends JControllerForm
 						$ownerId = $record->created_by;
 					}
 
-					// [9533] If the owner matches 'me' then allow.
+					// [9534] If the owner matches 'me' then allow.
 					if ($ownerId == $user->id)
 					{
 						if ($user->authorise('scaling_factor.edit.own', 'com_costbenefitprojection'))
@@ -132,7 +132,7 @@ class CostbenefitprojectionControllerScaling_factor extends JControllerForm
 				return false;
 			}
 		}
-		// [9555] Since there is no permission, revert to the component permissions.
+		// [9556] Since there is no permission, revert to the component permissions.
 		return $user->authorise('scaling_factor.edit', $this->option);
 	}
 
diff --git a/site/costbenefitprojection.php b/site/costbenefitprojection.php
index e1ba9a44..c9c06f97 100644
--- a/site/costbenefitprojection.php
+++ b/site/costbenefitprojection.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/helpers/costbenefitprojection.php b/site/helpers/costbenefitprojection.php
index 495d0268..4d3cec82 100644
--- a/site/helpers/costbenefitprojection.php
+++ b/site/helpers/costbenefitprojection.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -967,7 +967,7 @@ abstract class CostbenefitprojectionHelper
 	{
 		if (strpos($content,'class="uk-') !== false)
 		{
-			// [2605] reset
+			// [2606] reset
 			$temp = array();
 			foreach (self::$uk_components as $looking => $add)
 			{
@@ -976,15 +976,15 @@ abstract class CostbenefitprojectionHelper
 					$temp[] = $looking;
 				}
 			}
-			// [2614] make sure uikit is loaded to config
+			// [2615] make sure uikit is loaded to config
 			if (strpos($content,'class="uk-') !== false)
 			{
 				self::$uikit = true;
 			}
-			// [2619] sorter
+			// [2620] sorter
 			if (self::checkArray($temp))
 			{
-				// [2622] merger
+				// [2623] merger
 				if (self::checkArray($classes))
 				{
 					$newTemp = array_merge($temp,$classes);
diff --git a/site/helpers/headercheck.php b/site/helpers/headercheck.php
index 09a3de31..ea9fda1d 100644
--- a/site/helpers/headercheck.php
+++ b/site/helpers/headercheck.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/helpers/route.php b/site/helpers/route.php
index 4376c7b3..f8ba47ab 100644
--- a/site/helpers/route.php
+++ b/site/helpers/route.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -38,18 +38,18 @@ abstract class CostbenefitprojectionHelperRoute
 	{
 		if ($id > 0)
 		{
-			// [4586] Initialize the needel array.
+			// [4587] Initialize the needel array.
 			$needles = array(
 				'cpanel'  => array((int) $id)
 			);
-			// [4590] Create the link
+			// [4591] Create the link
 			$link = 'index.php?option=com_costbenefitprojection&view=cpanel&id='. $id;
 		}
 		else
 		{
-			// [4595] Initialize the needel array.
+			// [4596] Initialize the needel array.
 			$needles = array();
-			// [4597]Create the link but don't add the id.
+			// [4598]Create the link but don't add the id.
 			$link = 'index.php?option=com_costbenefitprojection&view=cpanel';
 		}
 		if ($catid > 1)
@@ -79,18 +79,18 @@ abstract class CostbenefitprojectionHelperRoute
 	{
 		if ($id > 0)
 		{
-			// [4586] Initialize the needel array.
+			// [4587] Initialize the needel array.
 			$needles = array(
 				'createaccount'  => array((int) $id)
 			);
-			// [4590] Create the link
+			// [4591] Create the link
 			$link = 'index.php?option=com_costbenefitprojection&view=createaccount&id='. $id;
 		}
 		else
 		{
-			// [4595] Initialize the needel array.
+			// [4596] Initialize the needel array.
 			$needles = array();
-			// [4597]Create the link but don't add the id.
+			// [4598]Create the link but don't add the id.
 			$link = 'index.php?option=com_costbenefitprojection&view=createaccount';
 		}
 		if ($catid > 1)
@@ -120,18 +120,18 @@ abstract class CostbenefitprojectionHelperRoute
 	{
 		if ($id > 0)
 		{
-			// [4586] Initialize the needel array.
+			// [4587] Initialize the needel array.
 			$needles = array(
 				'companyresults'  => array((int) $id)
 			);
-			// [4590] Create the link
+			// [4591] Create the link
 			$link = 'index.php?option=com_costbenefitprojection&view=companyresults&id='. $id;
 		}
 		else
 		{
-			// [4595] Initialize the needel array.
+			// [4596] Initialize the needel array.
 			$needles = array();
-			// [4597]Create the link but don't add the id.
+			// [4598]Create the link but don't add the id.
 			$link = 'index.php?option=com_costbenefitprojection&view=companyresults';
 		}
 		if ($catid > 1)
@@ -161,18 +161,18 @@ abstract class CostbenefitprojectionHelperRoute
 	{
 		if ($id > 0)
 		{
-			// [4586] Initialize the needel array.
+			// [4587] Initialize the needel array.
 			$needles = array(
 				'combinedresults'  => array((int) $id)
 			);
-			// [4590] Create the link
+			// [4591] Create the link
 			$link = 'index.php?option=com_costbenefitprojection&view=combinedresults&id='. $id;
 		}
 		else
 		{
-			// [4595] Initialize the needel array.
+			// [4596] Initialize the needel array.
 			$needles = array();
-			// [4597]Create the link but don't add the id.
+			// [4598]Create the link but don't add the id.
 			$link = 'index.php?option=com_costbenefitprojection&view=combinedresults';
 		}
 		if ($catid > 1)
diff --git a/site/layouts/appnotice.php b/site/layouts/appnotice.php
index 37d0e2b8..6b54bd3b 100644
--- a/site/layouts/appnotice.php
+++ b/site/layouts/appnotice.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/layouts/company/age_groups_percentages_fullwidth.php b/site/layouts/company/age_groups_percentages_fullwidth.php
index 482f30d9..1ea14738 100644
--- a/site/layouts/company/age_groups_percentages_fullwidth.php
+++ b/site/layouts/company/age_groups_percentages_fullwidth.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/layouts/company/age_groups_percentages_left.php b/site/layouts/company/age_groups_percentages_left.php
index 3dea1698..bb7726f8 100644
--- a/site/layouts/company/age_groups_percentages_left.php
+++ b/site/layouts/company/age_groups_percentages_left.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/layouts/company/age_groups_percentages_right.php b/site/layouts/company/age_groups_percentages_right.php
index db968ee0..a5eb012b 100644
--- a/site/layouts/company/age_groups_percentages_right.php
+++ b/site/layouts/company/age_groups_percentages_right.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/layouts/company/causerisk_selection_fullwidth.php b/site/layouts/company/causerisk_selection_fullwidth.php
index b88775f8..d7dfed82 100644
--- a/site/layouts/company/causerisk_selection_fullwidth.php
+++ b/site/layouts/company/causerisk_selection_fullwidth.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/layouts/company/details_above.php b/site/layouts/company/details_above.php
index 5c24fa48..ab4079e6 100644
--- a/site/layouts/company/details_above.php
+++ b/site/layouts/company/details_above.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/layouts/company/details_left.php b/site/layouts/company/details_left.php
index abbaf4ae..79c3d8e0 100644
--- a/site/layouts/company/details_left.php
+++ b/site/layouts/company/details_left.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/layouts/company/details_right.php b/site/layouts/company/details_right.php
index 40f0927a..77f71906 100644
--- a/site/layouts/company/details_right.php
+++ b/site/layouts/company/details_right.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/layouts/company/details_under.php b/site/layouts/company/details_under.php
index 310b74e5..b10f457c 100644
--- a/site/layouts/company/details_under.php
+++ b/site/layouts/company/details_under.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/layouts/company/interventions_fullwidth.php b/site/layouts/company/interventions_fullwidth.php
index 623234f5..334679fe 100644
--- a/site/layouts/company/interventions_fullwidth.php
+++ b/site/layouts/company/interventions_fullwidth.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -22,7 +22,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items	= $displayData->ljeinterventions;
+$items	= $displayData->zjtinterventions;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit	= "index.php?option=com_costbenefitprojection&view=interventions&task=intervention.edit";
diff --git a/site/layouts/company/publishing.php b/site/layouts/company/publishing.php
index 91211e65..5ccf6481 100644
--- a/site/layouts/company/publishing.php
+++ b/site/layouts/company/publishing.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/layouts/company/publlshing.php b/site/layouts/company/publlshing.php
index 63d87556..bd970818 100644
--- a/site/layouts/company/publlshing.php
+++ b/site/layouts/company/publlshing.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/layouts/company/scaling_factors_fullwidth.php b/site/layouts/company/scaling_factors_fullwidth.php
index 8a42ddde..2e25143f 100644
--- a/site/layouts/company/scaling_factors_fullwidth.php
+++ b/site/layouts/company/scaling_factors_fullwidth.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -22,7 +22,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items	= $displayData->oabscaling_factors;
+$items	= $displayData->yosscaling_factors;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit	= "index.php?option=com_costbenefitprojection&view=scaling_factors&task=scaling_factor.edit";
diff --git a/site/layouts/companydetails.php b/site/layouts/companydetails.php
index e88855a9..7a249f56 100644
--- a/site/layouts/companydetails.php
+++ b/site/layouts/companydetails.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/layouts/intervention/details_above.php b/site/layouts/intervention/details_above.php
index 2e849d15..0c13f387 100644
--- a/site/layouts/intervention/details_above.php
+++ b/site/layouts/intervention/details_above.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/layouts/intervention/details_fullwidth.php b/site/layouts/intervention/details_fullwidth.php
index de3643fa..36bc9af9 100644
--- a/site/layouts/intervention/details_fullwidth.php
+++ b/site/layouts/intervention/details_fullwidth.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/layouts/intervention/details_under.php b/site/layouts/intervention/details_under.php
index 310b74e5..b10f457c 100644
--- a/site/layouts/intervention/details_under.php
+++ b/site/layouts/intervention/details_under.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/layouts/intervention/publishing.php b/site/layouts/intervention/publishing.php
index 91211e65..5ccf6481 100644
--- a/site/layouts/intervention/publishing.php
+++ b/site/layouts/intervention/publishing.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/layouts/intervention/publlshing.php b/site/layouts/intervention/publlshing.php
index d9ccbd71..3977f093 100644
--- a/site/layouts/intervention/publlshing.php
+++ b/site/layouts/intervention/publlshing.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/layouts/intervention/settings_fullwidth.php b/site/layouts/intervention/settings_fullwidth.php
index 99092ac4..7f9c0c04 100644
--- a/site/layouts/intervention/settings_fullwidth.php
+++ b/site/layouts/intervention/settings_fullwidth.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/layouts/intervention/settings_left.php b/site/layouts/intervention/settings_left.php
index ca2827b0..ad123b04 100644
--- a/site/layouts/intervention/settings_left.php
+++ b/site/layouts/intervention/settings_left.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/layouts/scaling_factor/details_above.php b/site/layouts/scaling_factor/details_above.php
index 19c9cd5f..a3d08911 100644
--- a/site/layouts/scaling_factor/details_above.php
+++ b/site/layouts/scaling_factor/details_above.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/layouts/scaling_factor/details_left.php b/site/layouts/scaling_factor/details_left.php
index f265a8ab..2ef4737e 100644
--- a/site/layouts/scaling_factor/details_left.php
+++ b/site/layouts/scaling_factor/details_left.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/layouts/scaling_factor/details_right.php b/site/layouts/scaling_factor/details_right.php
index e24ef64e..52524bd0 100644
--- a/site/layouts/scaling_factor/details_right.php
+++ b/site/layouts/scaling_factor/details_right.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/layouts/scaling_factor/publishing.php b/site/layouts/scaling_factor/publishing.php
index 91211e65..5ccf6481 100644
--- a/site/layouts/scaling_factor/publishing.php
+++ b/site/layouts/scaling_factor/publishing.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/layouts/scaling_factor/publlshing.php b/site/layouts/scaling_factor/publlshing.php
index d9ccbd71..3977f093 100644
--- a/site/layouts/scaling_factor/publlshing.php
+++ b/site/layouts/scaling_factor/publlshing.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/models/ajax.php b/site/models/ajax.php
index eefb209f..5b95b8d9 100644
--- a/site/models/ajax.php
+++ b/site/models/ajax.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -37,13 +37,13 @@ class CostbenefitprojectionModelAjax extends JModelList
 
 	}
 
-	// [8924] Used in company
+	// [8925] Used in company
 	public function getCalculatedResult($id,$data)
 	{
 		return CostbenefitprojectionHelper::calculate($id,$data);
 	}
 
-	// [8924] Used in intervention
+	// [8925] Used in intervention
 public function getInterventionBuildTable($idName,$oject,$cluster)
 	{
 		if (CostbenefitprojectionHelper::isJson($oject) && CostbenefitprojectionHelper::checkString($idName))
diff --git a/site/models/combinedresults.php b/site/models/combinedresults.php
index 35b3096b..406a71f4 100644
--- a/site/models/combinedresults.php
+++ b/site/models/combinedresults.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -90,12 +90,12 @@ class CostbenefitprojectionModelCombinedresults extends JModelList
 				JFactory::getApplication()->redirect('index.php?option=com_costbenefitprojection&view=cpanel');
 			}
 		} 
-		// [2912] Make sure all records load, since no pagination allowed.
+		// [2913] Make sure all records load, since no pagination allowed.
 		$this->setState('list.limit', 0);
-		// [2914] Get a db connection.
+		// [2915] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2917] Create a new query object.
+		// [2918] Create a new query object.
 		$query = $db->getQuery(true);
 
 		// [1791] Get from #__costbenefitprojection_company as a
@@ -115,7 +115,7 @@ class CostbenefitprojectionModelCombinedresults extends JModelList
 			array('f.id','f.name','f.alias','f.codethree','f.numericcode','f.symbol','f.thousands','f.decimalplace','f.decimalsymbol','f.positivestyle','f.negativestyle','f.published','f.access','f.ordering'),
 			array('currency_id','currency_name','currency_alias','currency_codethree','currency_numericcode','currency_symbol','currency_thousands','currency_decimalplace','currency_decimalsymbol','currency_positivestyle','currency_negativestyle','currency_published','currency_access','currency_ordering')));
 		$query->join('LEFT', ($db->quoteName('#__costbenefitprojection_currency', 'f')) . ' ON (' . $db->quoteName('e.currency') . ' = ' . $db->quoteName('f.codethree') . ')');
-		// [2127] Check if $ids is an array with values.
+		// [2123] Check if $ids is an array with values.
 		$array = $ids;
 		if (isset($array) && CostbenefitprojectionHelper::checkArray($array))
 		{
@@ -126,7 +126,7 @@ class CostbenefitprojectionModelCombinedresults extends JModelList
 			return false;
 		}
 
-		// [2930] return the query object
+		// [2931] return the query object
 		return $query;
 	}
 
@@ -152,89 +152,89 @@ class CostbenefitprojectionModelCombinedresults extends JModelList
 		// Get the global params
 		$globalParams = JComponentHelper::getParams('com_costbenefitprojection', true);
 
-		// [3019] Get the advanced encription.
+		// [3020] Get the advanced encription.
 		$advancedkey = CostbenefitprojectionHelper::getCryptKey('advanced');
-		// [3021] Get the encription object.
+		// [3022] Get the encription object.
 		$advanced = new FOFEncryptAes($advancedkey, 256);
 
-		// [2945] Convert the parameter fields into objects.
+		// [2946] Convert the parameter fields into objects.
 		foreach ($items as $nr => &$item)
 		{
-			// [2948] Always create a slug for sef URL's
+			// [2949] Always create a slug for sef URL's
 			$item->slug = (isset($item->alias)) ? $item->id.':'.$item->alias : $item->id;
 			if (!empty($item->medical_turnovers_males) && $advancedkey && !is_numeric($item->medical_turnovers_males) && $item->medical_turnovers_males === base64_encode(base64_decode($item->medical_turnovers_males, true)))
 			{
-				// [1997] Decode medical_turnovers_males
+				// [1993] Decode medical_turnovers_males
 				$item->medical_turnovers_males = rtrim($advanced->decryptString($item->medical_turnovers_males), "\0");
 			}
 			if (!empty($item->sick_leave_males) && $advancedkey && !is_numeric($item->sick_leave_males) && $item->sick_leave_males === base64_encode(base64_decode($item->sick_leave_males, true)))
 			{
-				// [1997] Decode sick_leave_males
+				// [1993] Decode sick_leave_males
 				$item->sick_leave_males = rtrim($advanced->decryptString($item->sick_leave_males), "\0");
 			}
 			if (!empty($item->males) && $advancedkey && !is_numeric($item->males) && $item->males === base64_encode(base64_decode($item->males, true)))
 			{
-				// [1997] Decode males
+				// [1993] Decode males
 				$item->males = rtrim($advanced->decryptString($item->males), "\0");
 			}
 			if (CostbenefitprojectionHelper::checkString($item->causesrisks))
 			{
-				// [1997] Decode causesrisks
+				// [1993] Decode causesrisks
 				$item->causesrisks = json_decode($item->causesrisks, true);
 			}
 			if (!empty($item->females) && $advancedkey && !is_numeric($item->females) && $item->females === base64_encode(base64_decode($item->females, true)))
 			{
-				// [1997] Decode females
+				// [1993] Decode females
 				$item->females = rtrim($advanced->decryptString($item->females), "\0");
 			}
 			if (!empty($item->medical_turnovers_females) && $advancedkey && !is_numeric($item->medical_turnovers_females) && $item->medical_turnovers_females === base64_encode(base64_decode($item->medical_turnovers_females, true)))
 			{
-				// [1997] Decode medical_turnovers_females
+				// [1993] Decode medical_turnovers_females
 				$item->medical_turnovers_females = rtrim($advanced->decryptString($item->medical_turnovers_females), "\0");
 			}
 			if (!empty($item->sick_leave_females) && $advancedkey && !is_numeric($item->sick_leave_females) && $item->sick_leave_females === base64_encode(base64_decode($item->sick_leave_females, true)))
 			{
-				// [1997] Decode sick_leave_females
+				// [1993] Decode sick_leave_females
 				$item->sick_leave_females = rtrim($advanced->decryptString($item->sick_leave_females), "\0");
 			}
 			if (!empty($item->total_salary) && $advancedkey && !is_numeric($item->total_salary) && $item->total_salary === base64_encode(base64_decode($item->total_salary, true)))
 			{
-				// [1997] Decode total_salary
+				// [1993] Decode total_salary
 				$item->total_salary = rtrim($advanced->decryptString($item->total_salary), "\0");
 			}
 			if (!empty($item->total_healthcare) && $advancedkey && !is_numeric($item->total_healthcare) && $item->total_healthcare === base64_encode(base64_decode($item->total_healthcare, true)))
 			{
-				// [1997] Decode total_healthcare
+				// [1993] Decode total_healthcare
 				$item->total_healthcare = rtrim($advanced->decryptString($item->total_healthcare), "\0");
 			}
 			if (CostbenefitprojectionHelper::checkString($item->country_causesrisks))
 			{
-				// [1997] Decode country_causesrisks
+				// [1993] Decode country_causesrisks
 				$item->country_causesrisks = json_decode($item->country_causesrisks, true);
 			}
-			// [2012] Make sure the content prepare plugins fire on country_publicaddress.
+			// [2008] Make sure the content prepare plugins fire on country_publicaddress.
 			$item->country_publicaddress = JHtml::_('content.prepare',$item->country_publicaddress);
-			// [2014] Checking if country_publicaddress has uikit components that must be loaded.
+			// [2010] Checking if country_publicaddress has uikit components that must be loaded.
 			$this->uikitComp = CostbenefitprojectionHelper::getUikitComp($item->country_publicaddress,$this->uikitComp);
-			// [2312] set the global causesrisks value.
+			// [2313] set the global causesrisks value.
 			$this->a_causesrisks = $item->causesrisks;
-			// [2312] set the global datayear value.
+			// [2313] set the global datayear value.
 			$this->a_datayear = $item->datayear;
-			// [2312] set the global datayear value.
+			// [2313] set the global datayear value.
 			$this->e_datayear = $item->country_datayear;
-			// [2312] set the global causesrisks value.
+			// [2313] set the global causesrisks value.
 			$this->e_causesrisks = $item->country_causesrisks;
-			// [2045] set countryCountryHealth_dataB to the $item object.
+			// [2041] set countryCountryHealth_dataB to the $item object.
 			$item->countryCountryHealth_dataB = $this->getCountryCountryHealth_dataBcbb_B($item->country);
-			// [2045] set idCompanyScaling_factorC to the $item object.
+			// [2041] set idCompanyScaling_factorC to the $item object.
 			$item->idCompanyScaling_factorC = $this->getIdCompanyScaling_factorBcbb_C($item->id);
-			// [2045] set idCompanyInterventionD to the $item object.
+			// [2041] set idCompanyInterventionD to the $item object.
 			$item->idCompanyInterventionD = $this->getIdCompanyInterventionBcbb_D($item->id);
-			// [2045] set causesrisksIdCauseriskG to the $item object.
+			// [2041] set causesrisksIdCauseriskG to the $item object.
 			$item->causesrisksIdCauseriskG = $this->getCausesrisksIdCauseriskBcbb_G($item->causesrisks);
-			// [2045] set countryCountryHealth_dataBB to the $item object.
+			// [2041] set countryCountryHealth_dataBB to the $item object.
 			$item->countryCountryHealth_dataBB = $this->getCountryCountryHealth_dataBcbb_BB($item->country);
-			// [2045] set causesrisksIdCauseriskGG to the $item object.
+			// [2041] set causesrisksIdCauseriskGG to the $item object.
 			$item->causesrisksIdCauseriskGG = $this->getCausesrisksIdCauseriskBcbb_GG($item->country_causesrisks);
 		} 
 
@@ -250,19 +250,19 @@ class CostbenefitprojectionModelCombinedresults extends JModelList
 	*/
 	public function getCountryCountryHealth_dataBcbb_B($country)
 	{
-		// [2710] Get a db connection.
+		// [2711] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2712] Create a new query object.
+		// [2713] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2714] Get from #__costbenefitprojection_health_data as b
+		// [2715] Get from #__costbenefitprojection_health_data as b
 		$query->select($db->quoteName(
 			array('b.id','b.causerisk','b.year','b.maledeath','b.maleyld','b.femaledeath','b.femaleyld','b.published'),
 			array('id','causerisk','year','maledeath','maleyld','femaledeath','femaleyld','published')));
 		$query->from($db->quoteName('#__costbenefitprojection_health_data', 'b'));
 		$query->where('b.country = ' . $db->quote($country));
-		// [2127] Check if $this->a_causesrisks is an array with values.
+		// [2123] Check if $this->a_causesrisks is an array with values.
 		$array = $this->a_causesrisks;
 		if (isset($array) && CostbenefitprojectionHelper::checkArray($array))
 		{
@@ -276,11 +276,11 @@ class CostbenefitprojectionModelCombinedresults extends JModelList
 		$query->where('b.year = ' . $db->quote($this->a_datayear));
 		$query->order('b.ordering ASC');
 
-		// [2768] Reset the query using our newly populated query object.
+		// [2769] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2771] check if there was data returned
+		// [2772] check if there was data returned
 		if ($db->getNumRows())
 		{
 			return $db->loadObjectList();
@@ -296,13 +296,13 @@ class CostbenefitprojectionModelCombinedresults extends JModelList
 	*/
 	public function getIdCompanyScaling_factorBcbb_C($id)
 	{
-		// [2710] Get a db connection.
+		// [2711] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2712] Create a new query object.
+		// [2713] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2714] Get from #__costbenefitprojection_scaling_factor as c
+		// [2715] Get from #__costbenefitprojection_scaling_factor as c
 		$query->select($db->quoteName(
 			array('c.id','c.causerisk','c.reference','c.yld_scaling_factor_males','c.yld_scaling_factor_females','c.mortality_scaling_factor_males','c.mortality_scaling_factor_females','c.presenteeism_scaling_factor_males','c.presenteeism_scaling_factor_females','c.health_scaling_factor','c.published'),
 			array('id','causerisk','reference','yld_scaling_factor_males','yld_scaling_factor_females','mortality_scaling_factor_males','mortality_scaling_factor_females','presenteeism_scaling_factor_males','presenteeism_scaling_factor_females','health_scaling_factor','published')));
@@ -311,21 +311,21 @@ class CostbenefitprojectionModelCombinedresults extends JModelList
 		$query->where('c.published = 1');
 		$query->order('c.ordering ASC');
 
-		// [2768] Reset the query using our newly populated query object.
+		// [2769] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2771] check if there was data returned
+		// [2772] check if there was data returned
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [2824] Convert the parameter fields into objects.
+			// [2825] Convert the parameter fields into objects.
 			foreach ($items as $nr => &$item)
 			{
-				// [2012] Make sure the content prepare plugins fire on reference.
+				// [2008] Make sure the content prepare plugins fire on reference.
 				$item->reference = JHtml::_('content.prepare',$item->reference);
-				// [2014] Checking if reference has uikit components that must be loaded.
+				// [2010] Checking if reference has uikit components that must be loaded.
 				$this->uikitComp = CostbenefitprojectionHelper::getUikitComp($item->reference,$this->uikitComp);
 			}
 			return $items;
@@ -341,13 +341,13 @@ class CostbenefitprojectionModelCombinedresults extends JModelList
 	*/
 	public function getIdCompanyInterventionBcbb_D($id)
 	{
-		// [2710] Get a db connection.
+		// [2711] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2712] Create a new query object.
+		// [2713] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2714] Get from #__costbenefitprojection_intervention as d
+		// [2715] Get from #__costbenefitprojection_intervention as d
 		$query->select($db->quoteName(
 			array('d.id','d.name','d.type','d.coverage','d.duration','d.share','d.description','d.reference','d.intervention','d.published','d.created_by','d.modified_by','d.created','d.modified'),
 			array('id','name','type','coverage','duration','share','description','reference','intervention','published','created_by','modified_by','created','modified')));
@@ -356,25 +356,25 @@ class CostbenefitprojectionModelCombinedresults extends JModelList
 		$query->where('d.published = 1');
 		$query->order('d.ordering ASC');
 
-		// [2768] Reset the query using our newly populated query object.
+		// [2769] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2771] check if there was data returned
+		// [2772] check if there was data returned
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [2824] Convert the parameter fields into objects.
+			// [2825] Convert the parameter fields into objects.
 			foreach ($items as $nr => &$item)
 			{
-				// [2012] Make sure the content prepare plugins fire on description.
+				// [2008] Make sure the content prepare plugins fire on description.
 				$item->description = JHtml::_('content.prepare',$item->description);
-				// [2014] Checking if description has uikit components that must be loaded.
+				// [2010] Checking if description has uikit components that must be loaded.
 				$this->uikitComp = CostbenefitprojectionHelper::getUikitComp($item->description,$this->uikitComp);
-				// [2012] Make sure the content prepare plugins fire on reference.
+				// [2008] Make sure the content prepare plugins fire on reference.
 				$item->reference = JHtml::_('content.prepare',$item->reference);
-				// [2014] Checking if reference has uikit components that must be loaded.
+				// [2010] Checking if reference has uikit components that must be loaded.
 				$this->uikitComp = CostbenefitprojectionHelper::getUikitComp($item->reference,$this->uikitComp);
 			}
 			return $items;
@@ -390,19 +390,19 @@ class CostbenefitprojectionModelCombinedresults extends JModelList
 	*/
 	public function getCausesrisksIdCauseriskBcbb_G($causesrisks)
 	{
-		// [2710] Get a db connection.
+		// [2711] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2712] Create a new query object.
+		// [2713] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2714] Get from #__costbenefitprojection_causerisk as g
+		// [2715] Get from #__costbenefitprojection_causerisk as g
 		$query->select($db->quoteName(
 			array('g.id','g.name','g.ref','g.alias','g.description'),
 			array('id','name','ref','alias','description')));
 		$query->from($db->quoteName('#__costbenefitprojection_causerisk', 'g'));
 
-		// [2720] Check if $causesrisks is an array with values.
+		// [2721] Check if $causesrisks is an array with values.
 		$array = $causesrisks;
 		if (isset($array) && CostbenefitprojectionHelper::checkArray($array))
 		{
@@ -413,21 +413,21 @@ class CostbenefitprojectionModelCombinedresults extends JModelList
 			return false;
 		}
 
-		// [2768] Reset the query using our newly populated query object.
+		// [2769] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2771] check if there was data returned
+		// [2772] check if there was data returned
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [2824] Convert the parameter fields into objects.
+			// [2825] Convert the parameter fields into objects.
 			foreach ($items as $nr => &$item)
 			{
-				// [2012] Make sure the content prepare plugins fire on description.
+				// [2008] Make sure the content prepare plugins fire on description.
 				$item->description = JHtml::_('content.prepare',$item->description);
-				// [2014] Checking if description has uikit components that must be loaded.
+				// [2010] Checking if description has uikit components that must be loaded.
 				$this->uikitComp = CostbenefitprojectionHelper::getUikitComp($item->description,$this->uikitComp);
 			}
 			return $items;
@@ -443,19 +443,19 @@ class CostbenefitprojectionModelCombinedresults extends JModelList
 	*/
 	public function getCountryCountryHealth_dataBcbb_BB($country)
 	{
-		// [2710] Get a db connection.
+		// [2711] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2712] Create a new query object.
+		// [2713] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2714] Get from #__costbenefitprojection_health_data as bb
+		// [2715] Get from #__costbenefitprojection_health_data as bb
 		$query->select($db->quoteName(
 			array('bb.id','bb.asset_id','bb.causerisk','bb.year','bb.country','bb.maledeath','bb.maleyld','bb.femaledeath','bb.femaleyld','bb.published','bb.created_by','bb.modified_by','bb.created','bb.modified','bb.version','bb.hits','bb.ordering'),
 			array('id','asset_id','causerisk','year','country','maledeath','maleyld','femaledeath','femaleyld','published','created_by','modified_by','created','modified','version','hits','ordering')));
 		$query->from($db->quoteName('#__costbenefitprojection_health_data', 'bb'));
 		$query->where('bb.country = ' . $db->quote($country));
-		// [2127] Check if $this->e_causesrisks is an array with values.
+		// [2123] Check if $this->e_causesrisks is an array with values.
 		$array = $this->e_causesrisks;
 		if (isset($array) && CostbenefitprojectionHelper::checkArray($array))
 		{
@@ -469,11 +469,11 @@ class CostbenefitprojectionModelCombinedresults extends JModelList
 		$query->where('bb.year = ' . $db->quote($this->e_datayear));
 		$query->order('bb.ordering ASC');
 
-		// [2768] Reset the query using our newly populated query object.
+		// [2769] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2771] check if there was data returned
+		// [2772] check if there was data returned
 		if ($db->getNumRows())
 		{
 			return $db->loadObjectList();
@@ -489,19 +489,19 @@ class CostbenefitprojectionModelCombinedresults extends JModelList
 	*/
 	public function getCausesrisksIdCauseriskBcbb_GG($causesrisks)
 	{
-		// [2710] Get a db connection.
+		// [2711] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2712] Create a new query object.
+		// [2713] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2714] Get from #__costbenefitprojection_causerisk as gg
+		// [2715] Get from #__costbenefitprojection_causerisk as gg
 		$query->select($db->quoteName(
 			array('gg.id','gg.name','gg.ref','gg.alias','gg.description'),
 			array('id','name','ref','alias','description')));
 		$query->from($db->quoteName('#__costbenefitprojection_causerisk', 'gg'));
 
-		// [2720] Check if $causesrisks is an array with values.
+		// [2721] Check if $causesrisks is an array with values.
 		$array = $causesrisks;
 		if (isset($array) && CostbenefitprojectionHelper::checkArray($array))
 		{
@@ -512,21 +512,21 @@ class CostbenefitprojectionModelCombinedresults extends JModelList
 			return false;
 		}
 
-		// [2768] Reset the query using our newly populated query object.
+		// [2769] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2771] check if there was data returned
+		// [2772] check if there was data returned
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [2824] Convert the parameter fields into objects.
+			// [2825] Convert the parameter fields into objects.
 			foreach ($items as $nr => &$item)
 			{
-				// [2012] Make sure the content prepare plugins fire on description.
+				// [2008] Make sure the content prepare plugins fire on description.
 				$item->description = JHtml::_('content.prepare',$item->description);
-				// [2014] Checking if description has uikit components that must be loaded.
+				// [2010] Checking if description has uikit components that must be loaded.
 				$this->uikitComp = CostbenefitprojectionHelper::getUikitComp($item->description,$this->uikitComp);
 			}
 			return $items;
diff --git a/site/models/company.php b/site/models/company.php
index 74f72fe9..2ce9d6a0 100644
--- a/site/models/company.php
+++ b/site/models/company.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -91,60 +91,60 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 
 			if (!empty($item->causesrisks))
 			{
-				// [4004] JSON Decode causesrisks.
+				// [4005] JSON Decode causesrisks.
 				$item->causesrisks = json_decode($item->causesrisks);
 			}
 
-			// [4046] Get the advanced encription key.
+			// [4047] Get the advanced encription key.
 			$advancedkey = CostbenefitprojectionHelper::getCryptKey('advanced');
-			// [4048] Get the encription object.
+			// [4049] Get the encription object.
 			$advanced = new FOFEncryptAes($advancedkey, 256);
 
 			if (!empty($item->medical_turnovers_males) && $advancedkey && !is_numeric($item->medical_turnovers_males) && $item->medical_turnovers_males === base64_encode(base64_decode($item->medical_turnovers_males, true)))
 			{
-				// [4054] advanced decript data medical_turnovers_males.
+				// [4055] advanced decript data medical_turnovers_males.
 				$item->medical_turnovers_males = rtrim($advanced->decryptString($item->medical_turnovers_males), "\0");
 			}
 
 			if (!empty($item->sick_leave_males) && $advancedkey && !is_numeric($item->sick_leave_males) && $item->sick_leave_males === base64_encode(base64_decode($item->sick_leave_males, true)))
 			{
-				// [4054] advanced decript data sick_leave_males.
+				// [4055] advanced decript data sick_leave_males.
 				$item->sick_leave_males = rtrim($advanced->decryptString($item->sick_leave_males), "\0");
 			}
 
 			if (!empty($item->males) && $advancedkey && !is_numeric($item->males) && $item->males === base64_encode(base64_decode($item->males, true)))
 			{
-				// [4054] advanced decript data males.
+				// [4055] advanced decript data males.
 				$item->males = rtrim($advanced->decryptString($item->males), "\0");
 			}
 
 			if (!empty($item->females) && $advancedkey && !is_numeric($item->females) && $item->females === base64_encode(base64_decode($item->females, true)))
 			{
-				// [4054] advanced decript data females.
+				// [4055] advanced decript data females.
 				$item->females = rtrim($advanced->decryptString($item->females), "\0");
 			}
 
 			if (!empty($item->medical_turnovers_females) && $advancedkey && !is_numeric($item->medical_turnovers_females) && $item->medical_turnovers_females === base64_encode(base64_decode($item->medical_turnovers_females, true)))
 			{
-				// [4054] advanced decript data medical_turnovers_females.
+				// [4055] advanced decript data medical_turnovers_females.
 				$item->medical_turnovers_females = rtrim($advanced->decryptString($item->medical_turnovers_females), "\0");
 			}
 
 			if (!empty($item->sick_leave_females) && $advancedkey && !is_numeric($item->sick_leave_females) && $item->sick_leave_females === base64_encode(base64_decode($item->sick_leave_females, true)))
 			{
-				// [4054] advanced decript data sick_leave_females.
+				// [4055] advanced decript data sick_leave_females.
 				$item->sick_leave_females = rtrim($advanced->decryptString($item->sick_leave_females), "\0");
 			}
 
 			if (!empty($item->total_salary) && $advancedkey && !is_numeric($item->total_salary) && $item->total_salary === base64_encode(base64_decode($item->total_salary, true)))
 			{
-				// [4054] advanced decript data total_salary.
+				// [4055] advanced decript data total_salary.
 				$item->total_salary = rtrim($advanced->decryptString($item->total_salary), "\0");
 			}
 
 			if (!empty($item->total_healthcare) && $advancedkey && !is_numeric($item->total_healthcare) && $item->total_healthcare === base64_encode(base64_decode($item->total_healthcare, true)))
 			{
-				// [4054] advanced decript data total_healthcare.
+				// [4055] advanced decript data total_healthcare.
 				$item->total_healthcare = rtrim($advanced->decryptString($item->total_healthcare), "\0");
 			}
 			
@@ -154,8 +154,8 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 				$item->tags->getTagIds($item->id, 'com_costbenefitprojection.company');
 			}
 		}
-		$this->companyehly = $item->id;
-		$this->companynukc = $item->id;
+		$this->companyiwgy = $item->id;
+		$this->companygisn = $item->id;
 
 		return $item;
 	}
@@ -165,18 +165,18 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 	*
 	* @return mixed  An array of data items on success, false on failure.
 	*/
-	public function getOabscaling_factors()
+	public function getYosscaling_factors()
 	{
-		// [6953] Get the user object.
+		// [6954] Get the user object.
 		$user = JFactory::getUser();
-		// [6955] Create a new query object.
+		// [6956] Create a new query object.
 		$db = JFactory::getDBO();
 		$query = $db->getQuery(true);
 
-		// [6958] Select some fields
+		// [6959] Select some fields
 		$query->select('a.*');
 
-		// [6965] From the costbenefitprojection_scaling_factor table
+		// [6966] From the costbenefitprojection_scaling_factor table
 		$query->from($db->quoteName('#__costbenefitprojection_scaling_factor', 'a'));
 
 		// Filter by companies (admin sees all)
@@ -196,43 +196,43 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 			}
 		}
 
-		// [7558] From the costbenefitprojection_causerisk table.
+		// [7559] From the costbenefitprojection_causerisk table.
 		$query->select($db->quoteName('g.name','causerisk_name'));
 		$query->join('LEFT', $db->quoteName('#__costbenefitprojection_causerisk', 'g') . ' ON (' . $db->quoteName('a.causerisk') . ' = ' . $db->quoteName('g.id') . ')');
 
-		// [7558] From the costbenefitprojection_company table.
+		// [7559] From the costbenefitprojection_company table.
 		$query->select($db->quoteName('h.name','company_name'));
 		$query->join('LEFT', $db->quoteName('#__costbenefitprojection_company', 'h') . ' ON (' . $db->quoteName('a.company') . ' = ' . $db->quoteName('h.id') . ')');
 
-		// [6981] Filter by companyehly global.
-		$companyehly = $this->companyehly;
-		if (is_numeric($companyehly ))
+		// [6982] Filter by companyiwgy global.
+		$companyiwgy = $this->companyiwgy;
+		if (is_numeric($companyiwgy ))
 		{
-			$query->where('a.company = ' . (int) $companyehly );
+			$query->where('a.company = ' . (int) $companyiwgy );
 		}
-		elseif (is_string($companyehly))
+		elseif (is_string($companyiwgy))
 		{
-			$query->where('a.company = ' . $db->quote($companyehly));
+			$query->where('a.company = ' . $db->quote($companyiwgy));
 		}
 		else
 		{
 			$query->where('a.company = -5');
 		}
 
-		// [7013] Order the results by ordering
+		// [7014] Order the results by ordering
 		$query->order('a.ordering  ASC');
 
-		// [7015] Load the items
+		// [7016] Load the items
 		$db->setQuery($query);
 		$db->execute();
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [10619] set values to display correctly.
+			// [10620] set values to display correctly.
 			if (CostbenefitprojectionHelper::checkArray($items))
 			{
-				// [10622] get user object.
+				// [10623] get user object.
 				$user = JFactory::getUser();
 				foreach ($items as $nr => &$item)
 				{
@@ -255,18 +255,18 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 	*
 	* @return mixed  An array of data items on success, false on failure.
 	*/
-	public function getLjeinterventions()
+	public function getZjtinterventions()
 	{
-		// [6953] Get the user object.
+		// [6954] Get the user object.
 		$user = JFactory::getUser();
-		// [6955] Create a new query object.
+		// [6956] Create a new query object.
 		$db = JFactory::getDBO();
 		$query = $db->getQuery(true);
 
-		// [6958] Select some fields
+		// [6959] Select some fields
 		$query->select('a.*');
 
-		// [6965] From the costbenefitprojection_intervention table
+		// [6966] From the costbenefitprojection_intervention table
 		$query->from($db->quoteName('#__costbenefitprojection_intervention', 'a'));
 
 		// Filter the companies (admin sees all)
@@ -286,39 +286,39 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 			}
 		}
 
-		// [7558] From the costbenefitprojection_company table.
+		// [7559] From the costbenefitprojection_company table.
 		$query->select($db->quoteName('g.name','company_name'));
 		$query->join('LEFT', $db->quoteName('#__costbenefitprojection_company', 'g') . ' ON (' . $db->quoteName('a.company') . ' = ' . $db->quoteName('g.id') . ')');
 
-		// [6981] Filter by companynukc global.
-		$companynukc = $this->companynukc;
-		if (is_numeric($companynukc ))
+		// [6982] Filter by companygisn global.
+		$companygisn = $this->companygisn;
+		if (is_numeric($companygisn ))
 		{
-			$query->where('a.company = ' . (int) $companynukc );
+			$query->where('a.company = ' . (int) $companygisn );
 		}
-		elseif (is_string($companynukc))
+		elseif (is_string($companygisn))
 		{
-			$query->where('a.company = ' . $db->quote($companynukc));
+			$query->where('a.company = ' . $db->quote($companygisn));
 		}
 		else
 		{
 			$query->where('a.company = -5');
 		}
 
-		// [7013] Order the results by ordering
+		// [7014] Order the results by ordering
 		$query->order('a.ordering  ASC');
 
-		// [7015] Load the items
+		// [7016] Load the items
 		$db->setQuery($query);
 		$db->execute();
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [10619] set values to display correctly.
+			// [10620] set values to display correctly.
 			if (CostbenefitprojectionHelper::checkArray($items))
 			{
-				// [10622] get user object.
+				// [10623] get user object.
 				$user = JFactory::getUser();
 				foreach ($items as $nr => &$item)
 				{
@@ -345,13 +345,13 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 			}
 		} 
 
-			// [10885] set selection value to a translatable value
+			// [10886] set selection value to a translatable value
 			if (CostbenefitprojectionHelper::checkArray($items))
 			{
 				foreach ($items as $nr => &$item)
 				{
-					// [10892] convert type
-					$item->type = $this->selectionTranslationLjeinterventions($item->type, 'type');
+					// [10893] convert type
+					$item->type = $this->selectionTranslationZjtinterventions($item->type, 'type');
 				}
 			}
 
@@ -365,16 +365,16 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 	*
 	* @return translatable string
 	*/
-	public function selectionTranslationLjeinterventions($value,$name)
+	public function selectionTranslationZjtinterventions($value,$name)
 	{
-		// [10918] Array of type language strings
+		// [10919] Array of type language strings
 		if ($name == 'type')
 		{
 			$typeArray = array(
 				1 => 'COM_COSTBENEFITPROJECTION_INTERVENTION_SINGLE',
 				2 => 'COM_COSTBENEFITPROJECTION_INTERVENTION_CLUSTER'
 			);
-			// [10949] Now check if value is found in this array
+			// [10950] Now check if value is found in this array
 			if (isset($typeArray[$value]) && CostbenefitprojectionHelper::checkString($typeArray[$value]))
 			{
 				return $typeArray[$value];
@@ -394,7 +394,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 	 * @since   1.6
 	 */
 	public function getForm($data = array(), $loadData = true)
-	{		// [9574] Get the form.
+	{		// [9575] Get the form.
 		$form = $this->loadForm('com_costbenefitprojection.company', 'company', array('control' => 'jform', 'load_data' => $loadData));
 
 		if (empty($form))
@@ -404,12 +404,12 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 
 		$jinput = JFactory::getApplication()->input;
 
-		// [9659] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first.
+		// [9660] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first.
 		if ($jinput->get('a_id'))
 		{
 			$id = $jinput->get('a_id', 0, 'INT');
 		}
-		// [9664] The back end uses id so we use that the rest of the time and set it to 0 by default.
+		// [9665] The back end uses id so we use that the rest of the time and set it to 0 by default.
 		else
 		{
 			$id = $jinput->get('id', 0, 'INT');
@@ -417,207 +417,207 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 
 		$user = JFactory::getUser();
 
-		// [9670] Check for existing item.
-		// [9671] Modify the form based on Edit State access controls.
+		// [9671] Check for existing item.
+		// [9672] Modify the form based on Edit State access controls.
 		if ($id != 0 && (!$user->authorise('company.edit.state', 'com_costbenefitprojection.company.' . (int) $id))
 			|| ($id == 0 && !$user->authorise('company.edit.state', 'com_costbenefitprojection')))
 		{
-			// [9684] Disable fields for display.
+			// [9685] Disable fields for display.
 			$form->setFieldAttribute('ordering', 'disabled', 'true');
 			$form->setFieldAttribute('published', 'disabled', 'true');
-			// [9687] Disable fields while saving.
+			// [9688] Disable fields while saving.
 			$form->setFieldAttribute('ordering', 'filter', 'unset');
 			$form->setFieldAttribute('published', 'filter', 'unset');
 		}
-		// [9692] Modify the form based on Edit Creaded By access controls.
+		// [9693] Modify the form based on Edit Creaded By access controls.
 		if ($id != 0 && (!$user->authorise('company.edit.created_by', 'com_costbenefitprojection.company.' . (int) $id))
 			|| ($id == 0 && !$user->authorise('company.edit.created_by', 'com_costbenefitprojection')))
 		{
-			// [9704] Disable fields for display.
+			// [9705] Disable fields for display.
 			$form->setFieldAttribute('created_by', 'disabled', 'true');
-			// [9706] Disable fields for display.
+			// [9707] Disable fields for display.
 			$form->setFieldAttribute('created_by', 'readonly', 'true');
-			// [9708] Disable fields while saving.
+			// [9709] Disable fields while saving.
 			$form->setFieldAttribute('created_by', 'filter', 'unset');
 		}
-		// [9711] Modify the form based on Edit Creaded Date access controls.
+		// [9712] Modify the form based on Edit Creaded Date access controls.
 		if ($id != 0 && (!$user->authorise('company.edit.created', 'com_costbenefitprojection.company.' . (int) $id))
 			|| ($id == 0 && !$user->authorise('company.edit.created', 'com_costbenefitprojection')))
 		{
-			// [9723] Disable fields for display.
+			// [9724] Disable fields for display.
 			$form->setFieldAttribute('created', 'disabled', 'true');
-			// [9725] Disable fields while saving.
+			// [9726] Disable fields while saving.
 			$form->setFieldAttribute('created', 'filter', 'unset');
 		}
-		// [9733] Modify the form based on Edit Email access controls.
+		// [9734] Modify the form based on Edit Email access controls.
 		if ($id != 0 && (!$user->authorise('company.edit.email', 'com_costbenefitprojection.company.' . (int) $id))
 			|| ($id == 0 && !$user->authorise('company.edit.email', 'com_costbenefitprojection')))
 		{
-			// [9737] Disable fields for display.
+			// [9738] Disable fields for display.
 			$form->setFieldAttribute('email', 'disabled', 'true');
-			// [9739] Disable fields for display.
+			// [9740] Disable fields for display.
 			$form->setFieldAttribute('email', 'readonly', 'true');
 			if (!$form->getValue('email'))
 			{
-				// [9749] Disable fields while saving.
+				// [9750] Disable fields while saving.
 				$form->setFieldAttribute('email', 'filter', 'unset');
-				// [9751] Disable fields while saving.
+				// [9752] Disable fields while saving.
 				$form->setFieldAttribute('email', 'required', 'false');
 			}
 		}
-		// [9733] Modify the form based on Edit User access controls.
+		// [9734] Modify the form based on Edit User access controls.
 		if ($id != 0 && (!$user->authorise('company.edit.user', 'com_costbenefitprojection.company.' . (int) $id))
 			|| ($id == 0 && !$user->authorise('company.edit.user', 'com_costbenefitprojection')))
 		{
-			// [9737] Disable fields for display.
+			// [9738] Disable fields for display.
 			$form->setFieldAttribute('user', 'disabled', 'true');
-			// [9739] Disable fields for display.
+			// [9740] Disable fields for display.
 			$form->setFieldAttribute('user', 'readonly', 'true');
 			if (!$form->getValue('user'))
 			{
-				// [9749] Disable fields while saving.
+				// [9750] Disable fields while saving.
 				$form->setFieldAttribute('user', 'filter', 'unset');
-				// [9751] Disable fields while saving.
+				// [9752] Disable fields while saving.
 				$form->setFieldAttribute('user', 'required', 'false');
 			}
 		}
-		// [9733] Modify the form based on Edit Department access controls.
+		// [9734] Modify the form based on Edit Department access controls.
 		if ($id != 0 && (!$user->authorise('company.edit.department', 'com_costbenefitprojection.company.' . (int) $id))
 			|| ($id == 0 && !$user->authorise('company.edit.department', 'com_costbenefitprojection')))
 		{
-			// [9737] Disable fields for display.
+			// [9738] Disable fields for display.
 			$form->setFieldAttribute('department', 'disabled', 'true');
-			// [9739] Disable fields for display.
+			// [9740] Disable fields for display.
 			$form->setFieldAttribute('department', 'readonly', 'true');
-			// [9743] Disable radio button for display.
+			// [9744] Disable radio button for display.
 			$class = $form->getFieldAttribute('department', 'class', '');
 			$form->setFieldAttribute('department', 'class', $class.' disabled no-click');
 			if (!$form->getValue('department'))
 			{
-				// [9749] Disable fields while saving.
+				// [9750] Disable fields while saving.
 				$form->setFieldAttribute('department', 'filter', 'unset');
-				// [9751] Disable fields while saving.
+				// [9752] Disable fields while saving.
 				$form->setFieldAttribute('department', 'required', 'false');
 			}
 		}
-		// [9733] Modify the form based on Edit Country access controls.
+		// [9734] Modify the form based on Edit Country access controls.
 		if ($id != 0 && (!$user->authorise('company.edit.country', 'com_costbenefitprojection.company.' . (int) $id))
 			|| ($id == 0 && !$user->authorise('company.edit.country', 'com_costbenefitprojection')))
 		{
-			// [9737] Disable fields for display.
+			// [9738] Disable fields for display.
 			$form->setFieldAttribute('country', 'disabled', 'true');
-			// [9739] Disable fields for display.
+			// [9740] Disable fields for display.
 			$form->setFieldAttribute('country', 'readonly', 'true');
 			if (!$form->getValue('country'))
 			{
-				// [9749] Disable fields while saving.
+				// [9750] Disable fields while saving.
 				$form->setFieldAttribute('country', 'filter', 'unset');
-				// [9751] Disable fields while saving.
+				// [9752] Disable fields while saving.
 				$form->setFieldAttribute('country', 'required', 'false');
 			}
 		}
-		// [9733] Modify the form based on Edit Serviceprovider access controls.
+		// [9734] Modify the form based on Edit Serviceprovider access controls.
 		if ($id != 0 && (!$user->authorise('company.edit.serviceprovider', 'com_costbenefitprojection.company.' . (int) $id))
 			|| ($id == 0 && !$user->authorise('company.edit.serviceprovider', 'com_costbenefitprojection')))
 		{
-			// [9737] Disable fields for display.
+			// [9738] Disable fields for display.
 			$form->setFieldAttribute('serviceprovider', 'disabled', 'true');
-			// [9739] Disable fields for display.
+			// [9740] Disable fields for display.
 			$form->setFieldAttribute('serviceprovider', 'readonly', 'true');
 			if (!$form->getValue('serviceprovider'))
 			{
-				// [9749] Disable fields while saving.
+				// [9750] Disable fields while saving.
 				$form->setFieldAttribute('serviceprovider', 'filter', 'unset');
-				// [9751] Disable fields while saving.
+				// [9752] Disable fields while saving.
 				$form->setFieldAttribute('serviceprovider', 'required', 'false');
 			}
 		}
-		// [9733] Modify the form based on Edit Per access controls.
+		// [9734] Modify the form based on Edit Per access controls.
 		if ($id != 0 && (!$user->authorise('company.edit.per', 'com_costbenefitprojection.company.' . (int) $id))
 			|| ($id == 0 && !$user->authorise('company.edit.per', 'com_costbenefitprojection')))
 		{
-			// [9737] Disable fields for display.
+			// [9738] Disable fields for display.
 			$form->setFieldAttribute('per', 'disabled', 'true');
-			// [9739] Disable fields for display.
+			// [9740] Disable fields for display.
 			$form->setFieldAttribute('per', 'readonly', 'true');
-			// [9743] Disable radio button for display.
+			// [9744] Disable radio button for display.
 			$class = $form->getFieldAttribute('per', 'class', '');
 			$form->setFieldAttribute('per', 'class', $class.' disabled no-click');
 			if (!$form->getValue('per'))
 			{
-				// [9749] Disable fields while saving.
+				// [9750] Disable fields while saving.
 				$form->setFieldAttribute('per', 'filter', 'unset');
-				// [9751] Disable fields while saving.
+				// [9752] Disable fields while saving.
 				$form->setFieldAttribute('per', 'required', 'false');
 			}
 		}
-		// [9733] Modify the form based on Edit Causesrisks access controls.
+		// [9734] Modify the form based on Edit Causesrisks access controls.
 		if ($id != 0 && (!$user->authorise('company.edit.causesrisks', 'com_costbenefitprojection.company.' . (int) $id))
 			|| ($id == 0 && !$user->authorise('company.edit.causesrisks', 'com_costbenefitprojection')))
 		{
-			// [9737] Disable fields for display.
+			// [9738] Disable fields for display.
 			$form->setFieldAttribute('causesrisks', 'disabled', 'true');
-			// [9739] Disable fields for display.
+			// [9740] Disable fields for display.
 			$form->setFieldAttribute('causesrisks', 'readonly', 'true');
 			if (!$form->getValue('causesrisks'))
 			{
-				// [9749] Disable fields while saving.
+				// [9750] Disable fields while saving.
 				$form->setFieldAttribute('causesrisks', 'filter', 'unset');
-				// [9751] Disable fields while saving.
+				// [9752] Disable fields while saving.
 				$form->setFieldAttribute('causesrisks', 'required', 'false');
 			}
 		}
-		// [9733] Modify the form based on Edit Percentfemale access controls.
+		// [9734] Modify the form based on Edit Percentfemale access controls.
 		if ($id != 0 && (!$user->authorise('company.edit.percentfemale', 'com_costbenefitprojection.company.' . (int) $id))
 			|| ($id == 0 && !$user->authorise('company.edit.percentfemale', 'com_costbenefitprojection')))
 		{
-			// [9737] Disable fields for display.
+			// [9738] Disable fields for display.
 			$form->setFieldAttribute('percentfemale', 'disabled', 'true');
-			// [9739] Disable fields for display.
+			// [9740] Disable fields for display.
 			$form->setFieldAttribute('percentfemale', 'readonly', 'true');
-			// [9743] Disable radio button for display.
+			// [9744] Disable radio button for display.
 			$class = $form->getFieldAttribute('percentfemale', 'class', '');
 			$form->setFieldAttribute('percentfemale', 'class', $class.' disabled no-click');
 			if (!$form->getValue('percentfemale'))
 			{
-				// [9749] Disable fields while saving.
+				// [9750] Disable fields while saving.
 				$form->setFieldAttribute('percentfemale', 'filter', 'unset');
-				// [9751] Disable fields while saving.
+				// [9752] Disable fields while saving.
 				$form->setFieldAttribute('percentfemale', 'required', 'false');
 			}
 		}
-		// [9733] Modify the form based on Edit Datayear access controls.
+		// [9734] Modify the form based on Edit Datayear access controls.
 		if ($id != 0 && (!$user->authorise('company.edit.datayear', 'com_costbenefitprojection.company.' . (int) $id))
 			|| ($id == 0 && !$user->authorise('company.edit.datayear', 'com_costbenefitprojection')))
 		{
-			// [9737] Disable fields for display.
+			// [9738] Disable fields for display.
 			$form->setFieldAttribute('datayear', 'disabled', 'true');
-			// [9739] Disable fields for display.
+			// [9740] Disable fields for display.
 			$form->setFieldAttribute('datayear', 'readonly', 'true');
 			if (!$form->getValue('datayear'))
 			{
-				// [9749] Disable fields while saving.
+				// [9750] Disable fields while saving.
 				$form->setFieldAttribute('datayear', 'filter', 'unset');
-				// [9751] Disable fields while saving.
+				// [9752] Disable fields while saving.
 				$form->setFieldAttribute('datayear', 'required', 'false');
 			}
 		}
-		// [9733] Modify the form based on Edit Percentmale access controls.
+		// [9734] Modify the form based on Edit Percentmale access controls.
 		if ($id != 0 && (!$user->authorise('company.edit.percentmale', 'com_costbenefitprojection.company.' . (int) $id))
 			|| ($id == 0 && !$user->authorise('company.edit.percentmale', 'com_costbenefitprojection')))
 		{
-			// [9737] Disable fields for display.
+			// [9738] Disable fields for display.
 			$form->setFieldAttribute('percentmale', 'disabled', 'true');
-			// [9739] Disable fields for display.
+			// [9740] Disable fields for display.
 			$form->setFieldAttribute('percentmale', 'readonly', 'true');
-			// [9743] Disable radio button for display.
+			// [9744] Disable radio button for display.
 			$class = $form->getFieldAttribute('percentmale', 'class', '');
 			$form->setFieldAttribute('percentmale', 'class', $class.' disabled no-click');
 			if (!$form->getValue('percentmale'))
 			{
-				// [9749] Disable fields while saving.
+				// [9750] Disable fields while saving.
 				$form->setFieldAttribute('percentmale', 'filter', 'unset');
-				// [9751] Disable fields while saving.
+				// [9752] Disable fields while saving.
 				$form->setFieldAttribute('percentmale', 'required', 'false');
 			}
 		}
@@ -654,7 +654,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 			}
 
 			$user = JFactory::getUser();
-			// [9875] The record has been set. Check the record permissions.
+			// [9876] The record has been set. Check the record permissions.
 			return $user->authorise('company.delete', 'com_costbenefitprojection.company.' . (int) $record->id);
 		}
 		return false;
@@ -676,14 +676,14 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 
 		if ($recordId)
 		{
-			// [9962] The record has been set. Check the record permissions.
+			// [9963] The record has been set. Check the record permissions.
 			$permission = $user->authorise('company.edit.state', 'com_costbenefitprojection.company.' . (int) $recordId);
 			if (!$permission && !is_null($permission))
 			{
 				return false;
 			}
 		}
-		// [9979] In the absense of better information, revert to the component permissions.
+		// [9980] In the absense of better information, revert to the component permissions.
 		return $user->authorise('company.edit.state', 'com_costbenefitprojection');
 	}
     
@@ -698,7 +698,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 	 */
 	protected function allowEdit($data = array(), $key = 'id')
 	{
-		// [9787] Check specific edit permission then general edit permission.
+		// [9788] Check specific edit permission then general edit permission.
 		$user = JFactory::getUser();
 		$recordId	= (int) isset($data[$key]) ? $data[$key] : 0;
 		if (!$user->authorise('core.options', 'com_costbenefitprojection'))
@@ -813,20 +813,20 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 	*/
 	public function validate($form, $data, $group = null)
 	{
-		// [8778] check if the not_required field is set
+		// [8779] check if the not_required field is set
 		if (CostbenefitprojectionHelper::checkString($data['not_required']))
 		{
 			$requiredFields = (array) explode(',',(string) $data['not_required']);
 			$requiredFields = array_unique($requiredFields);
-			// [8783] now change the required field attributes value
+			// [8784] now change the required field attributes value
 			foreach ($requiredFields as $requiredField)
 			{
-				// [8786] make sure there is a string value
+				// [8787] make sure there is a string value
 				if (CostbenefitprojectionHelper::checkString($requiredField))
 				{
-					// [8789] change to false
+					// [8790] change to false
 					$form->setFieldAttribute($requiredField, 'required', 'false');
-					// [8791] also clear the data set
+					// [8792] also clear the data set
 					$data[$requiredField] = '';
 				}
 			}
@@ -957,7 +957,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 	{
 		if (empty($this->batchSet))
 		{
-			// [4940] Set some needed variables.
+			// [4941] Set some needed variables.
 			$this->user 		= JFactory::getUser();
 			$this->table 		= $this->getTable();
 			$this->tableClassName	= get_class($this->table);
@@ -1000,12 +1000,12 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 			}
 		}
 
-		// [4960] get list of uniqe fields
+		// [4961] get list of uniqe fields
 		$uniqeFields = $this->getUniqeFields();
-		// [4962] remove move_copy from array
+		// [4963] remove move_copy from array
 		unset($values['move_copy']);
 
-		// [4965] make sure published is set
+		// [4966] make sure published is set
 		if (!isset($values['published']))
 		{
 			$values['published'] = 0;
@@ -1017,21 +1017,21 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 
 		$newIds = array();
 
-		// [5002] Parent exists so let's proceed
+		// [5003] Parent exists so let's proceed
 		while (!empty($pks))
 		{
-			// [5005] Pop the first ID off the stack
+			// [5006] Pop the first ID off the stack
 			$pk = array_shift($pks);
 
 			$this->table->reset();
 
-			// [5010] only allow copy if user may edit this item.
+			// [5011] only allow copy if user may edit this item.
 
 			if (!$this->user->authorise('company.edit', $contexts[$pk]))
 
 			{
 
-				// [5020] Not fatal error
+				// [5021] Not fatal error
 
 				$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 
@@ -1039,19 +1039,19 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 
 			}
 
-			// [5025] Check that the row actually exists
+			// [5026] Check that the row actually exists
 			if (!$this->table->load($pk))
 			{
 				if ($error = $this->table->getError())
 				{
-					// [5030] Fatal error
+					// [5031] Fatal error
 					$this->setError($error);
 
 					return false;
 				}
 				else
 				{
-					// [5037] Not fatal error
+					// [5038] Not fatal error
 					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 					continue;
 				}
@@ -1059,7 +1059,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 
 			$this->table->name = $this->generateUniqe('name',$this->table->name);
 
-			// [5073] insert all set values
+			// [5074] insert all set values
 			if (CostbenefitprojectionHelper::checkArray($values))
 			{
 				foreach ($values as $key => $value)
@@ -1071,7 +1071,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 				}
 			}
 
-			// [5085] update all uniqe fields
+			// [5086] update all uniqe fields
 			if (CostbenefitprojectionHelper::checkArray($uniqeFields))
 			{
 				foreach ($uniqeFields as $uniqeField)
@@ -1080,13 +1080,13 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 				}
 			}
 
-			// [5094] Reset the ID because we are making a copy
+			// [5095] Reset the ID because we are making a copy
 			$this->table->id = 0;
 
-			// [5097] TODO: Deal with ordering?
-			// [5098] $this->table->ordering	= 1;
+			// [5098] TODO: Deal with ordering?
+			// [5099] $this->table->ordering	= 1;
 
-			// [5100] Check the row.
+			// [5101] Check the row.
 			if (!$this->table->check())
 			{
 				$this->setError($this->table->getError());
@@ -1099,7 +1099,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 				$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
 			}
 
-			// [5113] Store the row.
+			// [5114] Store the row.
 			if (!$this->table->store())
 			{
 				$this->setError($this->table->getError());
@@ -1107,14 +1107,14 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 				return false;
 			}
 
-			// [5121] Get the new item ID
+			// [5122] Get the new item ID
 			$newId = $this->table->get('id');
 
-			// [5124] Add the new ID to the array
+			// [5125] Add the new ID to the array
 			$newIds[$pk] = $newId;
 		}
 
-		// [5128] Clean the cache
+		// [5129] Clean the cache
 		$this->cleanCache();
 
 		return $newIds;
@@ -1135,7 +1135,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 	{
 		if (empty($this->batchSet))
 		{
-			// [4742] Set some needed variables.
+			// [4743] Set some needed variables.
 			$this->user		= JFactory::getUser();
 			$this->table		= $this->getTable();
 			$this->tableClassName	= get_class($this->table);
@@ -1179,15 +1179,15 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 			}
 		}
 
-		// [4764] make sure published only updates if user has the permission.
+		// [4765] make sure published only updates if user has the permission.
 		if (isset($values['published']) && !$this->canDo->get('company.edit.state'))
 		{
 			unset($values['published']);
 		}
-		// [4777] remove move_copy from array
+		// [4778] remove move_copy from array
 		unset($values['move_copy']);
 
-		// [4798] Parent exists so we proceed
+		// [4799] Parent exists so we proceed
 		foreach ($pks as $pk)
 		{
 			if (!$this->user->authorise('company.edit', $contexts[$pk]))
@@ -1197,30 +1197,30 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 				return false;
 			}
 
-			// [4815] Check that the row actually exists
+			// [4816] Check that the row actually exists
 			if (!$this->table->load($pk))
 			{
 				if ($error = $this->table->getError())
 				{
-					// [4820] Fatal error
+					// [4821] Fatal error
 					$this->setError($error);
 
 					return false;
 				}
 				else
 				{
-					// [4827] Not fatal error
+					// [4828] Not fatal error
 					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 					continue;
 				}
 			}
 
-			// [4833] insert all set values.
+			// [4834] insert all set values.
 			if (CostbenefitprojectionHelper::checkArray($values))
 			{
 				foreach ($values as $key => $value)
 				{
-					// [4838] Do special action for access.
+					// [4839] Do special action for access.
 					if ('access' == $key && strlen($value) > 0)
 					{
 						$this->table->$key = $value;
@@ -1233,7 +1233,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 			}
 
 
-			// [4850] Check the row.
+			// [4851] Check the row.
 			if (!$this->table->check())
 			{
 				$this->setError($this->table->getError());
@@ -1246,7 +1246,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 				$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
 			}
 
-			// [4863] Store the row.
+			// [4864] Store the row.
 			if (!$this->table->store())
 			{
 				$this->setError($this->table->getError());
@@ -1255,7 +1255,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 			}
 		}
 
-		// [4872] Clean the cache
+		// [4873] Clean the cache
 		$this->cleanCache();
 
 		return true;
@@ -1285,60 +1285,60 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 			$data['metadata'] = (string) $metadata;
 		} 
 
-		// [4114] Set the causesrisks string to JSON string.
+		// [4115] Set the causesrisks string to JSON string.
 		if (isset($data['causesrisks']))
 		{
 			$data['causesrisks'] = (string) json_encode($data['causesrisks']);
 		}
 
-		// [4154] Get the advanced encription key.
+		// [4155] Get the advanced encription key.
 		$advancedkey = CostbenefitprojectionHelper::getCryptKey('advanced');
-		// [4156] Get the encription object
+		// [4157] Get the encription object
 		$advanced = new FOFEncryptAes($advancedkey, 256);
 
-		// [4160] Encript data medical_turnovers_males.
+		// [4161] Encript data medical_turnovers_males.
 		if (isset($data['medical_turnovers_males']) && $advancedkey)
 		{
 			$data['medical_turnovers_males'] = $advanced->encryptString($data['medical_turnovers_males']);
 		}
 
-		// [4160] Encript data sick_leave_males.
+		// [4161] Encript data sick_leave_males.
 		if (isset($data['sick_leave_males']) && $advancedkey)
 		{
 			$data['sick_leave_males'] = $advanced->encryptString($data['sick_leave_males']);
 		}
 
-		// [4160] Encript data males.
+		// [4161] Encript data males.
 		if (isset($data['males']) && $advancedkey)
 		{
 			$data['males'] = $advanced->encryptString($data['males']);
 		}
 
-		// [4160] Encript data females.
+		// [4161] Encript data females.
 		if (isset($data['females']) && $advancedkey)
 		{
 			$data['females'] = $advanced->encryptString($data['females']);
 		}
 
-		// [4160] Encript data medical_turnovers_females.
+		// [4161] Encript data medical_turnovers_females.
 		if (isset($data['medical_turnovers_females']) && $advancedkey)
 		{
 			$data['medical_turnovers_females'] = $advanced->encryptString($data['medical_turnovers_females']);
 		}
 
-		// [4160] Encript data sick_leave_females.
+		// [4161] Encript data sick_leave_females.
 		if (isset($data['sick_leave_females']) && $advancedkey)
 		{
 			$data['sick_leave_females'] = $advanced->encryptString($data['sick_leave_females']);
 		}
 
-		// [4160] Encript data total_salary.
+		// [4161] Encript data total_salary.
 		if (isset($data['total_salary']) && $advancedkey)
 		{
 			$data['total_salary'] = $advanced->encryptString($data['total_salary']);
 		}
 
-		// [4160] Encript data total_healthcare.
+		// [4161] Encript data total_healthcare.
 		if (isset($data['total_healthcare']) && $advancedkey)
 		{
 			$data['total_healthcare'] = $advanced->encryptString($data['total_healthcare']);
@@ -1359,10 +1359,10 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 			$data['params'] = (string) $params;
 		}
 
-		// [5220] Alter the uniqe field for save as copy
+		// [5221] Alter the uniqe field for save as copy
 		if ($input->get('task') == 'save2copy')
 		{
-			// [5223] Automatic handling of other uniqe fields
+			// [5224] Automatic handling of other uniqe fields
 			$uniqeFields = $this->getUniqeFields();
 			if (CostbenefitprojectionHelper::checkArray($uniqeFields))
 			{
@@ -1415,7 +1415,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 	protected function _generateNewTitle($title)
 	{
 
-		// [5278] Alter the title
+		// [5279] Alter the title
 		$table = $this->getTable();
 
 		while ($table->load(array('title' => $title)))
diff --git a/site/models/companyresults.php b/site/models/companyresults.php
index 7898e2d3..3d289524 100644
--- a/site/models/companyresults.php
+++ b/site/models/companyresults.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -135,14 +135,14 @@ class CostbenefitprojectionModelCompanyresults extends JModelItem
 			try
 			{
 
-				// [2434] Get the advanced encription.
+				// [2435] Get the advanced encription.
 				$advancedkey = CostbenefitprojectionHelper::getCryptKey('advanced');
-				// [2436] Get the encription object.
+				// [2437] Get the encription object.
 				$advanced = new FOFEncryptAes($advancedkey, 256);
-				// [2340] Get a db connection.
+				// [2341] Get a db connection.
 				$db = JFactory::getDbo();
 
-				// [2342] Create a new query object.
+				// [2343] Create a new query object.
 				$query = $db->getQuery(true);
 
 				// [1791] Get from #__costbenefitprojection_company as a
@@ -164,94 +164,94 @@ class CostbenefitprojectionModelCompanyresults extends JModelItem
 				$query->join('LEFT', ($db->quoteName('#__costbenefitprojection_currency', 'f')) . ' ON (' . $db->quoteName('e.currency') . ' = ' . $db->quoteName('f.codethree') . ')');
 				$query->where('a.id = ' . (int) $pk);
 
-				// [2353] Reset the query using our newly populated query object.
+				// [2354] Reset the query using our newly populated query object.
 				$db->setQuery($query);
-				// [2355] Load the results as a stdClass object.
+				// [2356] Load the results as a stdClass object.
 				$data = $db->loadObject();
 
 				if (empty($data))
 				{
-					// [2366] If no data is found redirect to default page and show warning.
+					// [2367] If no data is found redirect to default page and show warning.
 					JError::raiseWarning(500, JText::_('COM_COSTBENEFITPROJECTION_NOT_FOUND_OR_ACCESS_DENIED'));
 					JFactory::getApplication()->redirect('index.php?option=com_costbenefitprojection&view=cpanel');
 					return false;
 				}
 				if (!empty($data->medical_turnovers_males) && $advancedkey && !is_numeric($data->medical_turnovers_males) && $data->medical_turnovers_males === base64_encode(base64_decode($data->medical_turnovers_males, true)))
 				{
-					// [1997] Decode medical_turnovers_males
+					// [1993] Decode medical_turnovers_males
 					$data->medical_turnovers_males = rtrim($advanced->decryptString($data->medical_turnovers_males), "\0");
 				}
 				if (!empty($data->sick_leave_males) && $advancedkey && !is_numeric($data->sick_leave_males) && $data->sick_leave_males === base64_encode(base64_decode($data->sick_leave_males, true)))
 				{
-					// [1997] Decode sick_leave_males
+					// [1993] Decode sick_leave_males
 					$data->sick_leave_males = rtrim($advanced->decryptString($data->sick_leave_males), "\0");
 				}
 				if (!empty($data->males) && $advancedkey && !is_numeric($data->males) && $data->males === base64_encode(base64_decode($data->males, true)))
 				{
-					// [1997] Decode males
+					// [1993] Decode males
 					$data->males = rtrim($advanced->decryptString($data->males), "\0");
 				}
 				if (CostbenefitprojectionHelper::checkString($data->causesrisks))
 				{
-					// [1997] Decode causesrisks
+					// [1993] Decode causesrisks
 					$data->causesrisks = json_decode($data->causesrisks, true);
 				}
 				if (!empty($data->females) && $advancedkey && !is_numeric($data->females) && $data->females === base64_encode(base64_decode($data->females, true)))
 				{
-					// [1997] Decode females
+					// [1993] Decode females
 					$data->females = rtrim($advanced->decryptString($data->females), "\0");
 				}
 				if (!empty($data->medical_turnovers_females) && $advancedkey && !is_numeric($data->medical_turnovers_females) && $data->medical_turnovers_females === base64_encode(base64_decode($data->medical_turnovers_females, true)))
 				{
-					// [1997] Decode medical_turnovers_females
+					// [1993] Decode medical_turnovers_females
 					$data->medical_turnovers_females = rtrim($advanced->decryptString($data->medical_turnovers_females), "\0");
 				}
 				if (!empty($data->sick_leave_females) && $advancedkey && !is_numeric($data->sick_leave_females) && $data->sick_leave_females === base64_encode(base64_decode($data->sick_leave_females, true)))
 				{
-					// [1997] Decode sick_leave_females
+					// [1993] Decode sick_leave_females
 					$data->sick_leave_females = rtrim($advanced->decryptString($data->sick_leave_females), "\0");
 				}
 				if (!empty($data->total_salary) && $advancedkey && !is_numeric($data->total_salary) && $data->total_salary === base64_encode(base64_decode($data->total_salary, true)))
 				{
-					// [1997] Decode total_salary
+					// [1993] Decode total_salary
 					$data->total_salary = rtrim($advanced->decryptString($data->total_salary), "\0");
 				}
 				if (!empty($data->total_healthcare) && $advancedkey && !is_numeric($data->total_healthcare) && $data->total_healthcare === base64_encode(base64_decode($data->total_healthcare, true)))
 				{
-					// [1997] Decode total_healthcare
+					// [1993] Decode total_healthcare
 					$data->total_healthcare = rtrim($advanced->decryptString($data->total_healthcare), "\0");
 				}
 				if (CostbenefitprojectionHelper::checkString($data->country_causesrisks))
 				{
-					// [1997] Decode country_causesrisks
+					// [1993] Decode country_causesrisks
 					$data->country_causesrisks = json_decode($data->country_causesrisks, true);
 				}
-				// [2012] Make sure the content prepare plugins fire on country_publicaddress.
+				// [2008] Make sure the content prepare plugins fire on country_publicaddress.
 				$data->country_publicaddress = JHtml::_('content.prepare',$data->country_publicaddress);
-				// [2014] Checking if country_publicaddress has uikit components that must be loaded.
+				// [2010] Checking if country_publicaddress has uikit components that must be loaded.
 				$this->uikitComp = CostbenefitprojectionHelper::getUikitComp($data->country_publicaddress,$this->uikitComp);
-				// [2312] set the global causesrisks value.
+				// [2313] set the global causesrisks value.
 				$this->a_causesrisks = $data->causesrisks;
-				// [2312] set the global datayear value.
+				// [2313] set the global datayear value.
 				$this->a_datayear = $data->datayear;
-				// [2312] set the global datayear value.
+				// [2313] set the global datayear value.
 				$this->e_datayear = $data->country_datayear;
-				// [2312] set the global causesrisks value.
+				// [2313] set the global causesrisks value.
 				$this->e_causesrisks = $data->country_causesrisks;
-				// [2045] set countryCountryHealth_dataB to the $data object.
+				// [2041] set countryCountryHealth_dataB to the $data object.
 				$data->countryCountryHealth_dataB = $this->getCountryCountryHealth_dataEbbe_B($data->country);
-				// [2045] set idCompanyScaling_factorC to the $data object.
+				// [2041] set idCompanyScaling_factorC to the $data object.
 				$data->idCompanyScaling_factorC = $this->getIdCompanyScaling_factorEbbe_C($data->id);
-				// [2045] set idCompanyInterventionD to the $data object.
+				// [2041] set idCompanyInterventionD to the $data object.
 				$data->idCompanyInterventionD = $this->getIdCompanyInterventionEbbe_D($data->id);
-				// [2045] set causesrisksIdCauseriskG to the $data object.
+				// [2041] set causesrisksIdCauseriskG to the $data object.
 				$data->causesrisksIdCauseriskG = $this->getCausesrisksIdCauseriskEbbe_G($data->causesrisks);
-				// [2045] set countryCountryHealth_dataBB to the $data object.
+				// [2041] set countryCountryHealth_dataBB to the $data object.
 				$data->countryCountryHealth_dataBB = $this->getCountryCountryHealth_dataEbbe_BB($data->country);
-				// [2045] set causesrisksIdCauseriskGG to the $data object.
+				// [2041] set causesrisksIdCauseriskGG to the $data object.
 				$data->causesrisksIdCauseriskGG = $this->getCausesrisksIdCauseriskEbbe_GG($data->country_causesrisks);
 
-				// [2460] set data object to item.
+				// [2461] set data object to item.
 				$this->_item[$pk] = $data;
 			}
 			catch (Exception $e)
@@ -280,19 +280,19 @@ class CostbenefitprojectionModelCompanyresults extends JModelItem
 	*/
 	public function getCountryCountryHealth_dataEbbe_B($country)
 	{
-		// [2710] Get a db connection.
+		// [2711] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2712] Create a new query object.
+		// [2713] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2714] Get from #__costbenefitprojection_health_data as b
+		// [2715] Get from #__costbenefitprojection_health_data as b
 		$query->select($db->quoteName(
 			array('b.id','b.causerisk','b.year','b.maledeath','b.maleyld','b.femaledeath','b.femaleyld','b.published'),
 			array('id','causerisk','year','maledeath','maleyld','femaledeath','femaleyld','published')));
 		$query->from($db->quoteName('#__costbenefitprojection_health_data', 'b'));
 		$query->where('b.country = ' . $db->quote($country));
-				// [2127] Check if $this->a_causesrisks is an array with values.
+				// [2123] Check if $this->a_causesrisks is an array with values.
 				$array = $this->a_causesrisks;
 				if (isset($array) && CostbenefitprojectionHelper::checkArray($array))
 				{
@@ -306,11 +306,11 @@ class CostbenefitprojectionModelCompanyresults extends JModelItem
 		$query->where('b.year = ' . $db->quote($this->a_datayear));
 		$query->order('b.ordering ASC');
 
-		// [2768] Reset the query using our newly populated query object.
+		// [2769] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2771] check if there was data returned
+		// [2772] check if there was data returned
 		if ($db->getNumRows())
 		{
 			return $db->loadObjectList();
@@ -326,13 +326,13 @@ class CostbenefitprojectionModelCompanyresults extends JModelItem
 	*/
 	public function getIdCompanyScaling_factorEbbe_C($id)
 	{
-		// [2710] Get a db connection.
+		// [2711] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2712] Create a new query object.
+		// [2713] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2714] Get from #__costbenefitprojection_scaling_factor as c
+		// [2715] Get from #__costbenefitprojection_scaling_factor as c
 		$query->select($db->quoteName(
 			array('c.id','c.causerisk','c.reference','c.yld_scaling_factor_males','c.yld_scaling_factor_females','c.mortality_scaling_factor_males','c.mortality_scaling_factor_females','c.presenteeism_scaling_factor_males','c.presenteeism_scaling_factor_females','c.health_scaling_factor','c.published'),
 			array('id','causerisk','reference','yld_scaling_factor_males','yld_scaling_factor_females','mortality_scaling_factor_males','mortality_scaling_factor_females','presenteeism_scaling_factor_males','presenteeism_scaling_factor_females','health_scaling_factor','published')));
@@ -341,21 +341,21 @@ class CostbenefitprojectionModelCompanyresults extends JModelItem
 		$query->where('c.published = 1');
 		$query->order('c.ordering ASC');
 
-		// [2768] Reset the query using our newly populated query object.
+		// [2769] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2771] check if there was data returned
+		// [2772] check if there was data returned
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [2824] Convert the parameter fields into objects.
+			// [2825] Convert the parameter fields into objects.
 			foreach ($items as $nr => &$item)
 			{
-				// [2012] Make sure the content prepare plugins fire on reference.
+				// [2008] Make sure the content prepare plugins fire on reference.
 				$item->reference = JHtml::_('content.prepare',$item->reference);
-				// [2014] Checking if reference has uikit components that must be loaded.
+				// [2010] Checking if reference has uikit components that must be loaded.
 				$this->uikitComp = CostbenefitprojectionHelper::getUikitComp($item->reference,$this->uikitComp);
 			}
 			return $items;
@@ -371,13 +371,13 @@ class CostbenefitprojectionModelCompanyresults extends JModelItem
 	*/
 	public function getIdCompanyInterventionEbbe_D($id)
 	{
-		// [2710] Get a db connection.
+		// [2711] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2712] Create a new query object.
+		// [2713] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2714] Get from #__costbenefitprojection_intervention as d
+		// [2715] Get from #__costbenefitprojection_intervention as d
 		$query->select($db->quoteName(
 			array('d.id','d.name','d.type','d.coverage','d.duration','d.share','d.description','d.reference','d.intervention','d.published','d.created_by','d.modified_by','d.created','d.modified'),
 			array('id','name','type','coverage','duration','share','description','reference','intervention','published','created_by','modified_by','created','modified')));
@@ -386,25 +386,25 @@ class CostbenefitprojectionModelCompanyresults extends JModelItem
 		$query->where('d.published = 1');
 		$query->order('d.ordering ASC');
 
-		// [2768] Reset the query using our newly populated query object.
+		// [2769] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2771] check if there was data returned
+		// [2772] check if there was data returned
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [2824] Convert the parameter fields into objects.
+			// [2825] Convert the parameter fields into objects.
 			foreach ($items as $nr => &$item)
 			{
-				// [2012] Make sure the content prepare plugins fire on description.
+				// [2008] Make sure the content prepare plugins fire on description.
 				$item->description = JHtml::_('content.prepare',$item->description);
-				// [2014] Checking if description has uikit components that must be loaded.
+				// [2010] Checking if description has uikit components that must be loaded.
 				$this->uikitComp = CostbenefitprojectionHelper::getUikitComp($item->description,$this->uikitComp);
-				// [2012] Make sure the content prepare plugins fire on reference.
+				// [2008] Make sure the content prepare plugins fire on reference.
 				$item->reference = JHtml::_('content.prepare',$item->reference);
-				// [2014] Checking if reference has uikit components that must be loaded.
+				// [2010] Checking if reference has uikit components that must be loaded.
 				$this->uikitComp = CostbenefitprojectionHelper::getUikitComp($item->reference,$this->uikitComp);
 			}
 			return $items;
@@ -420,19 +420,19 @@ class CostbenefitprojectionModelCompanyresults extends JModelItem
 	*/
 	public function getCausesrisksIdCauseriskEbbe_G($causesrisks)
 	{
-		// [2710] Get a db connection.
+		// [2711] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2712] Create a new query object.
+		// [2713] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2714] Get from #__costbenefitprojection_causerisk as g
+		// [2715] Get from #__costbenefitprojection_causerisk as g
 		$query->select($db->quoteName(
 			array('g.id','g.name','g.ref','g.alias','g.description'),
 			array('id','name','ref','alias','description')));
 		$query->from($db->quoteName('#__costbenefitprojection_causerisk', 'g'));
 
-		// [2720] Check if $causesrisks is an array with values.
+		// [2721] Check if $causesrisks is an array with values.
 		$array = $causesrisks;
 		if (isset($array) && CostbenefitprojectionHelper::checkArray($array))
 		{
@@ -443,21 +443,21 @@ class CostbenefitprojectionModelCompanyresults extends JModelItem
 			return false;
 		}
 
-		// [2768] Reset the query using our newly populated query object.
+		// [2769] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2771] check if there was data returned
+		// [2772] check if there was data returned
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [2824] Convert the parameter fields into objects.
+			// [2825] Convert the parameter fields into objects.
 			foreach ($items as $nr => &$item)
 			{
-				// [2012] Make sure the content prepare plugins fire on description.
+				// [2008] Make sure the content prepare plugins fire on description.
 				$item->description = JHtml::_('content.prepare',$item->description);
-				// [2014] Checking if description has uikit components that must be loaded.
+				// [2010] Checking if description has uikit components that must be loaded.
 				$this->uikitComp = CostbenefitprojectionHelper::getUikitComp($item->description,$this->uikitComp);
 			}
 			return $items;
@@ -473,19 +473,19 @@ class CostbenefitprojectionModelCompanyresults extends JModelItem
 	*/
 	public function getCountryCountryHealth_dataEbbe_BB($country)
 	{
-		// [2710] Get a db connection.
+		// [2711] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2712] Create a new query object.
+		// [2713] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2714] Get from #__costbenefitprojection_health_data as bb
+		// [2715] Get from #__costbenefitprojection_health_data as bb
 		$query->select($db->quoteName(
 			array('bb.id','bb.asset_id','bb.causerisk','bb.year','bb.country','bb.maledeath','bb.maleyld','bb.femaledeath','bb.femaleyld','bb.published','bb.created_by','bb.modified_by','bb.created','bb.modified','bb.version','bb.hits','bb.ordering'),
 			array('id','asset_id','causerisk','year','country','maledeath','maleyld','femaledeath','femaleyld','published','created_by','modified_by','created','modified','version','hits','ordering')));
 		$query->from($db->quoteName('#__costbenefitprojection_health_data', 'bb'));
 		$query->where('bb.country = ' . $db->quote($country));
-				// [2127] Check if $this->e_causesrisks is an array with values.
+				// [2123] Check if $this->e_causesrisks is an array with values.
 				$array = $this->e_causesrisks;
 				if (isset($array) && CostbenefitprojectionHelper::checkArray($array))
 				{
@@ -499,11 +499,11 @@ class CostbenefitprojectionModelCompanyresults extends JModelItem
 		$query->where('bb.year = ' . $db->quote($this->e_datayear));
 		$query->order('bb.ordering ASC');
 
-		// [2768] Reset the query using our newly populated query object.
+		// [2769] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2771] check if there was data returned
+		// [2772] check if there was data returned
 		if ($db->getNumRows())
 		{
 			return $db->loadObjectList();
@@ -519,19 +519,19 @@ class CostbenefitprojectionModelCompanyresults extends JModelItem
 	*/
 	public function getCausesrisksIdCauseriskEbbe_GG($causesrisks)
 	{
-		// [2710] Get a db connection.
+		// [2711] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2712] Create a new query object.
+		// [2713] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2714] Get from #__costbenefitprojection_causerisk as gg
+		// [2715] Get from #__costbenefitprojection_causerisk as gg
 		$query->select($db->quoteName(
 			array('gg.id','gg.name','gg.ref','gg.alias','gg.description'),
 			array('id','name','ref','alias','description')));
 		$query->from($db->quoteName('#__costbenefitprojection_causerisk', 'gg'));
 
-		// [2720] Check if $causesrisks is an array with values.
+		// [2721] Check if $causesrisks is an array with values.
 		$array = $causesrisks;
 		if (isset($array) && CostbenefitprojectionHelper::checkArray($array))
 		{
@@ -542,21 +542,21 @@ class CostbenefitprojectionModelCompanyresults extends JModelItem
 			return false;
 		}
 
-		// [2768] Reset the query using our newly populated query object.
+		// [2769] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2771] check if there was data returned
+		// [2772] check if there was data returned
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [2824] Convert the parameter fields into objects.
+			// [2825] Convert the parameter fields into objects.
 			foreach ($items as $nr => &$item)
 			{
-				// [2012] Make sure the content prepare plugins fire on description.
+				// [2008] Make sure the content prepare plugins fire on description.
 				$item->description = JHtml::_('content.prepare',$item->description);
-				// [2014] Checking if description has uikit components that must be loaded.
+				// [2010] Checking if description has uikit components that must be loaded.
 				$this->uikitComp = CostbenefitprojectionHelper::getUikitComp($item->description,$this->uikitComp);
 			}
 			return $items;
diff --git a/site/models/cpanel.php b/site/models/cpanel.php
index 42338d8e..1ebb256d 100644
--- a/site/models/cpanel.php
+++ b/site/models/cpanel.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -59,12 +59,12 @@ class CostbenefitprojectionModelCpanel extends JModelList
 		$this->app		= JFactory::getApplication();
 		$this->input		= $this->app->input;
 		$this->initSet		= true; 
-		// [2912] Make sure all records load, since no pagination allowed.
+		// [2913] Make sure all records load, since no pagination allowed.
 		$this->setState('list.limit', 0);
-		// [2914] Get a db connection.
+		// [2915] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2917] Create a new query object.
+		// [2918] Create a new query object.
 		$query = $db->getQuery(true);
 
 		// [1791] Get from #__costbenefitprojection_company as a
@@ -99,7 +99,7 @@ class CostbenefitprojectionModelCpanel extends JModelList
 		$query->where('a.user = ' . (int) $this->userId);
 		$query->order('a.ordering ASC');
 
-		// [2930] return the query object
+		// [2931] return the query object
 		return $query;
 	}
 
@@ -125,72 +125,72 @@ class CostbenefitprojectionModelCpanel extends JModelList
 		// Get the global params
 		$globalParams = JComponentHelper::getParams('com_costbenefitprojection', true);
 
-		// [3019] Get the advanced encription.
+		// [3020] Get the advanced encription.
 		$advancedkey = CostbenefitprojectionHelper::getCryptKey('advanced');
-		// [3021] Get the encription object.
+		// [3022] Get the encription object.
 		$advanced = new FOFEncryptAes($advancedkey, 256);
 
-		// [2945] Convert the parameter fields into objects.
+		// [2946] Convert the parameter fields into objects.
 		foreach ($items as $nr => &$item)
 		{
-			// [2948] Always create a slug for sef URL's
+			// [2949] Always create a slug for sef URL's
 			$item->slug = (isset($item->alias)) ? $item->id.':'.$item->alias : $item->id;
 			if (!empty($item->medical_turnovers_males) && $advancedkey && !is_numeric($item->medical_turnovers_males) && $item->medical_turnovers_males === base64_encode(base64_decode($item->medical_turnovers_males, true)))
 			{
-				// [1997] Decode medical_turnovers_males
+				// [1993] Decode medical_turnovers_males
 				$item->medical_turnovers_males = rtrim($advanced->decryptString($item->medical_turnovers_males), "\0");
 			}
 			if (!empty($item->sick_leave_males) && $advancedkey && !is_numeric($item->sick_leave_males) && $item->sick_leave_males === base64_encode(base64_decode($item->sick_leave_males, true)))
 			{
-				// [1997] Decode sick_leave_males
+				// [1993] Decode sick_leave_males
 				$item->sick_leave_males = rtrim($advanced->decryptString($item->sick_leave_males), "\0");
 			}
 			if (!empty($item->males) && $advancedkey && !is_numeric($item->males) && $item->males === base64_encode(base64_decode($item->males, true)))
 			{
-				// [1997] Decode males
+				// [1993] Decode males
 				$item->males = rtrim($advanced->decryptString($item->males), "\0");
 			}
 			if (CostbenefitprojectionHelper::checkString($item->causesrisks))
 			{
-				// [1997] Decode causesrisks
+				// [1993] Decode causesrisks
 				$item->causesrisks = json_decode($item->causesrisks, true);
 			}
 			if (!empty($item->females) && $advancedkey && !is_numeric($item->females) && $item->females === base64_encode(base64_decode($item->females, true)))
 			{
-				// [1997] Decode females
+				// [1993] Decode females
 				$item->females = rtrim($advanced->decryptString($item->females), "\0");
 			}
 			if (!empty($item->medical_turnovers_females) && $advancedkey && !is_numeric($item->medical_turnovers_females) && $item->medical_turnovers_females === base64_encode(base64_decode($item->medical_turnovers_females, true)))
 			{
-				// [1997] Decode medical_turnovers_females
+				// [1993] Decode medical_turnovers_females
 				$item->medical_turnovers_females = rtrim($advanced->decryptString($item->medical_turnovers_females), "\0");
 			}
 			if (!empty($item->sick_leave_females) && $advancedkey && !is_numeric($item->sick_leave_females) && $item->sick_leave_females === base64_encode(base64_decode($item->sick_leave_females, true)))
 			{
-				// [1997] Decode sick_leave_females
+				// [1993] Decode sick_leave_females
 				$item->sick_leave_females = rtrim($advanced->decryptString($item->sick_leave_females), "\0");
 			}
 			if (!empty($item->total_salary) && $advancedkey && !is_numeric($item->total_salary) && $item->total_salary === base64_encode(base64_decode($item->total_salary, true)))
 			{
-				// [1997] Decode total_salary
+				// [1993] Decode total_salary
 				$item->total_salary = rtrim($advanced->decryptString($item->total_salary), "\0");
 			}
 			if (!empty($item->total_healthcare) && $advancedkey && !is_numeric($item->total_healthcare) && $item->total_healthcare === base64_encode(base64_decode($item->total_healthcare, true)))
 			{
-				// [1997] Decode total_healthcare
+				// [1993] Decode total_healthcare
 				$item->total_healthcare = rtrim($advanced->decryptString($item->total_healthcare), "\0");
 			}
-			// [2012] Make sure the content prepare plugins fire on country_publicaddress.
+			// [2008] Make sure the content prepare plugins fire on country_publicaddress.
 			$item->country_publicaddress = JHtml::_('content.prepare',$item->country_publicaddress);
-			// [2014] Checking if country_publicaddress has uikit components that must be loaded.
+			// [2010] Checking if country_publicaddress has uikit components that must be loaded.
 			$this->uikitComp = CostbenefitprojectionHelper::getUikitComp($item->country_publicaddress,$this->uikitComp);
-			// [2012] Make sure the content prepare plugins fire on service_provider_publicaddress.
+			// [2008] Make sure the content prepare plugins fire on service_provider_publicaddress.
 			$item->service_provider_publicaddress = JHtml::_('content.prepare',$item->service_provider_publicaddress);
-			// [2014] Checking if service_provider_publicaddress has uikit components that must be loaded.
+			// [2010] Checking if service_provider_publicaddress has uikit components that must be loaded.
 			$this->uikitComp = CostbenefitprojectionHelper::getUikitComp($item->service_provider_publicaddress,$this->uikitComp);
-			// [2045] set idCompanyScaling_factorD to the $item object.
+			// [2041] set idCompanyScaling_factorD to the $item object.
 			$item->idCompanyScaling_factorD = $this->getIdCompanyScaling_factorBdef_D($item->id);
-			// [2045] set idCompanyInterventionE to the $item object.
+			// [2041] set idCompanyInterventionE to the $item object.
 			$item->idCompanyInterventionE = $this->getIdCompanyInterventionBdef_E($item->id);
 		} 
 
@@ -206,13 +206,13 @@ class CostbenefitprojectionModelCpanel extends JModelList
 	*/
 	public function getIdCompanyScaling_factorBdef_D($id)
 	{
-		// [2710] Get a db connection.
+		// [2711] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2712] Create a new query object.
+		// [2713] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2714] Get from #__costbenefitprojection_scaling_factor as d
+		// [2715] Get from #__costbenefitprojection_scaling_factor as d
 		$query->select($db->quoteName(
 			array('d.id','d.asset_id','d.company','d.causerisk','d.reference','d.yld_scaling_factor_males','d.yld_scaling_factor_females','d.mortality_scaling_factor_males','d.mortality_scaling_factor_females','d.presenteeism_scaling_factor_males','d.presenteeism_scaling_factor_females','d.published','d.checked_out','d.checked_out_time','d.created_by','d.modified_by','d.created','d.modified','d.version','d.hits','d.ordering'),
 			array('id','asset_id','company','causerisk','reference','yld_scaling_factor_males','yld_scaling_factor_females','mortality_scaling_factor_males','mortality_scaling_factor_females','presenteeism_scaling_factor_males','presenteeism_scaling_factor_females','published','checked_out','checked_out_time','created_by','modified_by','created','modified','version','hits','ordering')));
@@ -226,21 +226,21 @@ class CostbenefitprojectionModelCpanel extends JModelList
 		$query->join('LEFT', ($db->quoteName('#__costbenefitprojection_causerisk', 'f')) . ' ON (' . $db->quoteName('d.causerisk') . ' = ' . $db->quoteName('f.id') . ')');
 		$query->order('d.ordering ASC');
 
-		// [2768] Reset the query using our newly populated query object.
+		// [2769] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2771] check if there was data returned
+		// [2772] check if there was data returned
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [2824] Convert the parameter fields into objects.
+			// [2825] Convert the parameter fields into objects.
 			foreach ($items as $nr => &$item)
 			{
-				// [2012] Make sure the content prepare plugins fire on reference.
+				// [2008] Make sure the content prepare plugins fire on reference.
 				$item->reference = JHtml::_('content.prepare',$item->reference);
-				// [2014] Checking if reference has uikit components that must be loaded.
+				// [2010] Checking if reference has uikit components that must be loaded.
 				$this->uikitComp = CostbenefitprojectionHelper::getUikitComp($item->reference,$this->uikitComp);
 			}
 			return $items;
@@ -256,13 +256,13 @@ class CostbenefitprojectionModelCpanel extends JModelList
 	*/
 	public function getIdCompanyInterventionBdef_E($id)
 	{
-		// [2710] Get a db connection.
+		// [2711] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2712] Create a new query object.
+		// [2713] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2714] Get from #__costbenefitprojection_intervention as e
+		// [2715] Get from #__costbenefitprojection_intervention as e
 		$query->select($db->quoteName(
 			array('e.id','e.name','e.type','e.coverage','e.duration','e.share','e.description','e.reference','e.interventions','e.intervention','e.not_required','e.published','e.checked_out','e.checked_out_time','e.created_by','e.modified_by','e.created','e.modified','e.version','e.hits','e.ordering'),
 			array('id','name','type','coverage','duration','share','description','reference','interventions','intervention','not_required','published','checked_out','checked_out_time','created_by','modified_by','created','modified','version','hits','ordering')));
@@ -270,30 +270,30 @@ class CostbenefitprojectionModelCpanel extends JModelList
 		$query->where('e.company = ' . $db->quote($id));
 		$query->order('e.ordering ASC');
 
-		// [2768] Reset the query using our newly populated query object.
+		// [2769] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2771] check if there was data returned
+		// [2772] check if there was data returned
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [2824] Convert the parameter fields into objects.
+			// [2825] Convert the parameter fields into objects.
 			foreach ($items as $nr => &$item)
 			{
 				if (CostbenefitprojectionHelper::checkString($item->interventions))
 				{
-					// [1997] Decode interventions
+					// [1993] Decode interventions
 					$item->interventions = json_decode($item->interventions, true);
 				}
-				// [2012] Make sure the content prepare plugins fire on description.
+				// [2008] Make sure the content prepare plugins fire on description.
 				$item->description = JHtml::_('content.prepare',$item->description);
-				// [2014] Checking if description has uikit components that must be loaded.
+				// [2010] Checking if description has uikit components that must be loaded.
 				$this->uikitComp = CostbenefitprojectionHelper::getUikitComp($item->description,$this->uikitComp);
-				// [2012] Make sure the content prepare plugins fire on reference.
+				// [2008] Make sure the content prepare plugins fire on reference.
 				$item->reference = JHtml::_('content.prepare',$item->reference);
-				// [2014] Checking if reference has uikit components that must be loaded.
+				// [2010] Checking if reference has uikit components that must be loaded.
 				$this->uikitComp = CostbenefitprojectionHelper::getUikitComp($item->reference,$this->uikitComp);
 			}
 			return $items;
diff --git a/site/models/createaccount.php b/site/models/createaccount.php
index 9a9cc474..979562fb 100644
--- a/site/models/createaccount.php
+++ b/site/models/createaccount.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -59,12 +59,12 @@ class CostbenefitprojectionModelCreateaccount extends JModelList
 		$this->app		= JFactory::getApplication();
 		$this->input		= $this->app->input;
 		$this->initSet		= true; 
-		// [2912] Make sure all records load, since no pagination allowed.
+		// [2913] Make sure all records load, since no pagination allowed.
 		$this->setState('list.limit', 0);
-		// [2914] Get a db connection.
+		// [2915] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2917] Create a new query object.
+		// [2918] Create a new query object.
 		$query = $db->getQuery(true);
 
 		// [1791] Get from #__costbenefitprojection_country as a
@@ -82,7 +82,7 @@ class CostbenefitprojectionModelCreateaccount extends JModelList
 		$query->where('a.published = 1');
 		$query->order('a.name ASC');
 
-		// [2930] return the query object
+		// [2931] return the query object
 		return $query;
 	}
 
@@ -108,16 +108,16 @@ class CostbenefitprojectionModelCreateaccount extends JModelList
 		// Get the global params
 		$globalParams = JComponentHelper::getParams('com_costbenefitprojection', true);
 
-		// [2945] Convert the parameter fields into objects.
+		// [2946] Convert the parameter fields into objects.
 		foreach ($items as $nr => &$item)
 		{
-			// [2948] Always create a slug for sef URL's
+			// [2949] Always create a slug for sef URL's
 			$item->slug = (isset($item->alias)) ? $item->id.':'.$item->alias : $item->id;
-			// [2012] Make sure the content prepare plugins fire on publicaddress.
+			// [2008] Make sure the content prepare plugins fire on publicaddress.
 			$item->publicaddress = JHtml::_('content.prepare',$item->publicaddress);
-			// [2014] Checking if publicaddress has uikit components that must be loaded.
+			// [2010] Checking if publicaddress has uikit components that must be loaded.
 			$this->uikitComp = CostbenefitprojectionHelper::getUikitComp($item->publicaddress,$this->uikitComp);
-			// [2045] set idCountryService_providerB to the $item object.
+			// [2041] set idCountryService_providerB to the $item object.
 			$item->idCountryService_providerB = $this->getIdCountryService_providerCace_B($item->id);
 		} 
 
@@ -133,13 +133,13 @@ class CostbenefitprojectionModelCreateaccount extends JModelList
 	*/
 	public function getIdCountryService_providerCace_B($id)
 	{
-		// [2710] Get a db connection.
+		// [2711] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2712] Create a new query object.
+		// [2713] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2714] Get from #__costbenefitprojection_service_provider as b
+		// [2715] Get from #__costbenefitprojection_service_provider as b
 		$query->select($db->quoteName(
 			array('b.id','b.user','b.publicname','b.publicemail','b.publicnumber','b.publicaddress'),
 			array('id','user','publicname','publicemail','publicnumber','publicaddress')));
@@ -148,21 +148,21 @@ class CostbenefitprojectionModelCreateaccount extends JModelList
 		$query->where('b.published = 1');
 		$query->order('b.publicname ASC');
 
-		// [2768] Reset the query using our newly populated query object.
+		// [2769] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2771] check if there was data returned
+		// [2772] check if there was data returned
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [2824] Convert the parameter fields into objects.
+			// [2825] Convert the parameter fields into objects.
 			foreach ($items as $nr => &$item)
 			{
-				// [2012] Make sure the content prepare plugins fire on publicaddress.
+				// [2008] Make sure the content prepare plugins fire on publicaddress.
 				$item->publicaddress = JHtml::_('content.prepare',$item->publicaddress);
-				// [2014] Checking if publicaddress has uikit components that must be loaded.
+				// [2010] Checking if publicaddress has uikit components that must be loaded.
 				$this->uikitComp = CostbenefitprojectionHelper::getUikitComp($item->publicaddress,$this->uikitComp);
 			}
 			return $items;
diff --git a/site/models/forms/company.js b/site/models/forms/company.js
index 7253e917..91e553cd 100644
--- a/site/models/forms/company.js
+++ b/site/models/forms/company.js
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -17,178 +17,178 @@
 /------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_MyenDgDunb_required = false;
-jform_MyenDgDhEP_required = false;
-jform_MyenDgDOtm_required = false;
-jform_MyenDgDxnU_required = false;
-jform_MyenDgDQwQ_required = false;
-jform_MyenDgDHoX_required = false;
-jform_MyenDgDOTm_required = false;
+jform_pydRZWraSY_required = false;
+jform_pydRZWrZBd_required = false;
+jform_pydRZWrJNR_required = false;
+jform_pydRZWrWAx_required = false;
+jform_pydRZWrrWa_required = false;
+jform_pydRZWrVtn_required = false;
+jform_pydRZWrqmt_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var department_MyenDgD = jQuery("#jform_department input[type='radio']:checked").val();
-	MyenDgD(department_MyenDgD);
+	var department_pydRZWr = jQuery("#jform_department input[type='radio']:checked").val();
+	pydRZWr(department_pydRZWr);
 
-	var department_JKkommy = jQuery("#jform_department input[type='radio']:checked").val();
-	JKkommy(department_JKkommy);
+	var department_sAKFZSC = jQuery("#jform_department input[type='radio']:checked").val();
+	sAKFZSC(department_sAKFZSC);
 });
 
-// the MyenDgD function
-function MyenDgD(department_MyenDgD)
+// the pydRZWr function
+function pydRZWr(department_pydRZWr)
 {
-	// [8016] set the function logic
-	if (department_MyenDgD == 2)
+	// [8017] set the function logic
+	if (department_pydRZWr == 2)
 	{
 		jQuery('#jform_causesrisks').closest('.control-group').show();
-		if (jform_MyenDgDunb_required)
+		if (jform_pydRZWraSY_required)
 		{
 			updateFieldRequired('causesrisks',0);
 			jQuery('#jform_causesrisks').prop('required','required');
 			jQuery('#jform_causesrisks').attr('aria-required',true);
 			jQuery('#jform_causesrisks').addClass('required');
-			jform_MyenDgDunb_required = false;
+			jform_pydRZWraSY_required = false;
 		}
 
 		jQuery('#jform_percentfemale').closest('.control-group').show();
 		jQuery('#jform_percentmale').closest('.control-group').show();
 		jQuery('#jform_productivity_losses').closest('.control-group').show();
-		if (jform_MyenDgDhEP_required)
+		if (jform_pydRZWrZBd_required)
 		{
 			updateFieldRequired('productivity_losses',0);
 			jQuery('#jform_productivity_losses').prop('required','required');
 			jQuery('#jform_productivity_losses').attr('aria-required',true);
 			jQuery('#jform_productivity_losses').addClass('required');
-			jform_MyenDgDhEP_required = false;
+			jform_pydRZWrZBd_required = false;
 		}
 
 		jQuery('#jform_medical_turnovers_females').closest('.control-group').show();
-		if (jform_MyenDgDOtm_required)
+		if (jform_pydRZWrJNR_required)
 		{
 			updateFieldRequired('medical_turnovers_females',0);
 			jQuery('#jform_medical_turnovers_females').prop('required','required');
 			jQuery('#jform_medical_turnovers_females').attr('aria-required',true);
 			jQuery('#jform_medical_turnovers_females').addClass('required');
-			jform_MyenDgDOtm_required = false;
+			jform_pydRZWrJNR_required = false;
 		}
 
 		jQuery('#jform_medical_turnovers_males').closest('.control-group').show();
-		if (jform_MyenDgDxnU_required)
+		if (jform_pydRZWrWAx_required)
 		{
 			updateFieldRequired('medical_turnovers_males',0);
 			jQuery('#jform_medical_turnovers_males').prop('required','required');
 			jQuery('#jform_medical_turnovers_males').attr('aria-required',true);
 			jQuery('#jform_medical_turnovers_males').addClass('required');
-			jform_MyenDgDxnU_required = false;
+			jform_pydRZWrWAx_required = false;
 		}
 
 		jQuery('#jform_sick_leave_females').closest('.control-group').show();
-		if (jform_MyenDgDQwQ_required)
+		if (jform_pydRZWrrWa_required)
 		{
 			updateFieldRequired('sick_leave_females',0);
 			jQuery('#jform_sick_leave_females').prop('required','required');
 			jQuery('#jform_sick_leave_females').attr('aria-required',true);
 			jQuery('#jform_sick_leave_females').addClass('required');
-			jform_MyenDgDQwQ_required = false;
+			jform_pydRZWrrWa_required = false;
 		}
 
 		jQuery('#jform_sick_leave_males').closest('.control-group').show();
-		if (jform_MyenDgDHoX_required)
+		if (jform_pydRZWrVtn_required)
 		{
 			updateFieldRequired('sick_leave_males',0);
 			jQuery('#jform_sick_leave_males').prop('required','required');
 			jQuery('#jform_sick_leave_males').attr('aria-required',true);
 			jQuery('#jform_sick_leave_males').addClass('required');
-			jform_MyenDgDHoX_required = false;
+			jform_pydRZWrVtn_required = false;
 		}
 
 		jQuery('#jform_total_healthcare').closest('.control-group').show();
-		if (jform_MyenDgDOTm_required)
+		if (jform_pydRZWrqmt_required)
 		{
 			updateFieldRequired('total_healthcare',0);
 			jQuery('#jform_total_healthcare').prop('required','required');
 			jQuery('#jform_total_healthcare').attr('aria-required',true);
 			jQuery('#jform_total_healthcare').addClass('required');
-			jform_MyenDgDOTm_required = false;
+			jform_pydRZWrqmt_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_causesrisks').closest('.control-group').hide();
-		if (!jform_MyenDgDunb_required)
+		if (!jform_pydRZWraSY_required)
 		{
 			updateFieldRequired('causesrisks',1);
 			jQuery('#jform_causesrisks').removeAttr('required');
 			jQuery('#jform_causesrisks').removeAttr('aria-required');
 			jQuery('#jform_causesrisks').removeClass('required');
-			jform_MyenDgDunb_required = true;
+			jform_pydRZWraSY_required = true;
 		}
 		jQuery('#jform_percentfemale').closest('.control-group').hide();
 		jQuery('#jform_percentmale').closest('.control-group').hide();
 		jQuery('#jform_productivity_losses').closest('.control-group').hide();
-		if (!jform_MyenDgDhEP_required)
+		if (!jform_pydRZWrZBd_required)
 		{
 			updateFieldRequired('productivity_losses',1);
 			jQuery('#jform_productivity_losses').removeAttr('required');
 			jQuery('#jform_productivity_losses').removeAttr('aria-required');
 			jQuery('#jform_productivity_losses').removeClass('required');
-			jform_MyenDgDhEP_required = true;
+			jform_pydRZWrZBd_required = true;
 		}
 		jQuery('#jform_medical_turnovers_females').closest('.control-group').hide();
-		if (!jform_MyenDgDOtm_required)
+		if (!jform_pydRZWrJNR_required)
 		{
 			updateFieldRequired('medical_turnovers_females',1);
 			jQuery('#jform_medical_turnovers_females').removeAttr('required');
 			jQuery('#jform_medical_turnovers_females').removeAttr('aria-required');
 			jQuery('#jform_medical_turnovers_females').removeClass('required');
-			jform_MyenDgDOtm_required = true;
+			jform_pydRZWrJNR_required = true;
 		}
 		jQuery('#jform_medical_turnovers_males').closest('.control-group').hide();
-		if (!jform_MyenDgDxnU_required)
+		if (!jform_pydRZWrWAx_required)
 		{
 			updateFieldRequired('medical_turnovers_males',1);
 			jQuery('#jform_medical_turnovers_males').removeAttr('required');
 			jQuery('#jform_medical_turnovers_males').removeAttr('aria-required');
 			jQuery('#jform_medical_turnovers_males').removeClass('required');
-			jform_MyenDgDxnU_required = true;
+			jform_pydRZWrWAx_required = true;
 		}
 		jQuery('#jform_sick_leave_females').closest('.control-group').hide();
-		if (!jform_MyenDgDQwQ_required)
+		if (!jform_pydRZWrrWa_required)
 		{
 			updateFieldRequired('sick_leave_females',1);
 			jQuery('#jform_sick_leave_females').removeAttr('required');
 			jQuery('#jform_sick_leave_females').removeAttr('aria-required');
 			jQuery('#jform_sick_leave_females').removeClass('required');
-			jform_MyenDgDQwQ_required = true;
+			jform_pydRZWrrWa_required = true;
 		}
 		jQuery('#jform_sick_leave_males').closest('.control-group').hide();
-		if (!jform_MyenDgDHoX_required)
+		if (!jform_pydRZWrVtn_required)
 		{
 			updateFieldRequired('sick_leave_males',1);
 			jQuery('#jform_sick_leave_males').removeAttr('required');
 			jQuery('#jform_sick_leave_males').removeAttr('aria-required');
 			jQuery('#jform_sick_leave_males').removeClass('required');
-			jform_MyenDgDHoX_required = true;
+			jform_pydRZWrVtn_required = true;
 		}
 		jQuery('#jform_total_healthcare').closest('.control-group').hide();
-		if (!jform_MyenDgDOTm_required)
+		if (!jform_pydRZWrqmt_required)
 		{
 			updateFieldRequired('total_healthcare',1);
 			jQuery('#jform_total_healthcare').removeAttr('required');
 			jQuery('#jform_total_healthcare').removeAttr('aria-required');
 			jQuery('#jform_total_healthcare').removeClass('required');
-			jform_MyenDgDOTm_required = true;
+			jform_pydRZWrqmt_required = true;
 		}
 	}
 }
 
-// the JKkommy function
-function JKkommy(department_JKkommy)
+// the sAKFZSC function
+function sAKFZSC(department_sAKFZSC)
 {
-	// [8016] set the function logic
-	if (department_JKkommy == 1)
+	// [8017] set the function logic
+	if (department_sAKFZSC == 1)
 	{
 		jQuery('.age_groups_note').closest('.control-group').show();
 		jQuery('.cause_risk_selection_note').closest('.control-group').show();
diff --git a/site/models/forms/company.xml b/site/models/forms/company.xml
index 3ba4a4c7..34df0715 100644
--- a/site/models/forms/company.xml
+++ b/site/models/forms/company.xml
@@ -4,15 +4,15 @@
 	addfieldpath="/administrator/components/com_costbenefitprojection/models/fields"
 >
 	<fieldset name="details">
-		<!-- [11027] Default Fields. -->
-		<!-- [11028] Id Field. Type: Text (joomla) -->
+		<!-- [11028] Default Fields. -->
+		<!-- [11029] Id Field. Type: Text (joomla) -->
 		<field
 			name="id"
 			type="text" class="readonly" label="JGLOBAL_FIELD_ID_LABEL"
 			description ="JGLOBAL_FIELD_ID_DESC" size="10" default="0"
 			readonly="true"
 		/>
-		<!-- [11035] Date Created Field. Type: Calendar (joomla) -->
+		<!-- [11036] Date Created Field. Type: Calendar (joomla) -->
 		<field
 			name="created"
 			type="calendar"
@@ -22,14 +22,14 @@
 			format="%Y-%m-%d %H:%M:%S"
 			filter="user_utc"
 		/>
-		<!-- [11046] User Created Field. Type: User (joomla) -->
+		<!-- [11047] User Created Field. Type: User (joomla) -->
 		<field
 			name="created_by"
 			type="user"
 			label="COM_COSTBENEFITPROJECTION_COMPANY_CREATED_BY_LABEL"
 			description="COM_COSTBENEFITPROJECTION_COMPANY_CREATED_BY_DESC"
 		/>
-		<!-- [11054] Published Field. Type: List (joomla) -->
+		<!-- [11055] Published Field. Type: List (joomla) -->
 		<field name="published" type="list" label="JSTATUS"
 			description="JFIELD_PUBLISHED_DESC" class="chzn-color-state"
 			filter="intval" size="1" default="1" >
@@ -42,18 +42,18 @@
 			<option value="-2">
 				JTRASHED</option>
 		</field>
-		<!-- [11069] Date Modified Field. Type: Calendar (joomla) -->
+		<!-- [11070] Date Modified Field. Type: Calendar (joomla) -->
 		<field name="modified" type="calendar" class="readonly"
 			label="JGLOBAL_FIELD_MODIFIED_LABEL" description="COM_CONTENT_FIELD_MODIFIED_DESC"
 			size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
-		<!-- [11073] User Modified Field. Type: User (joomla) -->
+		<!-- [11074] User Modified Field. Type: User (joomla) -->
 		<field name="modified_by" type="user"
 			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
 			class="readonly"
 			readonly="true"
 			filter="unset"
 		/>
-		<!-- [11083] Access Field. Type: Accesslevel (joomla) -->
+		<!-- [11084] Access Field. Type: Accesslevel (joomla) -->
 		<field name="access"
 			type="accesslevel"
 			label="JFIELD_ACCESS_LABEL"
@@ -61,7 +61,7 @@
 			default="1"
 			required="false"
 		/>
-		<!-- [11093] Ordering Field. Type: Numbers (joomla) -->
+		<!-- [11094] Ordering Field. Type: Numbers (joomla) -->
 		<field
 			name="ordering"
 			type="number"
@@ -72,7 +72,7 @@
 			size="6"
 			required="false"
 		/>
-		<!-- [11105] Version Field. Type: Text (joomla) -->
+		<!-- [11106] Version Field. Type: Text (joomla) -->
 		<field
 			name="version"
 			type="text"
@@ -83,8 +83,8 @@
 			readonly="true"
 			filter="unset"
 		/>
-		<!-- [11138] Dynamic Fields. -->
-		<!-- [11374] Name Field. Type: Text. (joomla) -->
+		<!-- [11139] Dynamic Fields. -->
+		<!-- [11375] Name Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="name"
@@ -100,7 +100,7 @@
 			message="Error! Please add company name here."
 			hint="COM_COSTBENEFITPROJECTION_COMPANY_NAME_HINT"
 		/>
-		<!-- [11374] Email Field. Type: Text. (joomla) -->
+		<!-- [11375] Email Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="email"
@@ -115,7 +115,7 @@
 			message="Error! Please add email address here."
 			hint="COM_COSTBENEFITPROJECTION_COMPANY_EMAIL_HINT"
 		/>
-		<!-- [11495] User Field. Type: Memberuser. (custom) -->
+		<!-- [11496] User Field. Type: Memberuser. (custom) -->
 		<field
 			type="memberuser"
 			name="user"
@@ -123,7 +123,7 @@
 			required="false"
 			hint="COM_COSTBENEFITPROJECTION_COMPANY_USER_HINT"
 		/>
-		<!-- [11288] Department Field. Type: Radio. (joomla) -->
+		<!-- [11289] Department Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
 			name="department"
@@ -131,13 +131,13 @@
 			class="btn-group"
 			default="1"
 			required="true">
-			<!-- [11360] Option Set. -->
+			<!-- [11361] Option Set. -->
 			<option value="1">
 				COM_COSTBENEFITPROJECTION_COMPANY_BASIC</option>
 			<option value="2">
 				COM_COSTBENEFITPROJECTION_COMPANY_ADVANCED</option>
 		</field>
-		<!-- [11495] Country Field. Type: Countries. (custom) -->
+		<!-- [11496] Country Field. Type: Countries. (custom) -->
 		<field
 			type="countries"
 			name="country"
@@ -148,7 +148,7 @@
 			default="0"
 			required="true"
 		/>
-		<!-- [11495] Serviceprovider Field. Type: Serviceprovider. (custom) -->
+		<!-- [11496] Serviceprovider Field. Type: Serviceprovider. (custom) -->
 		<field
 			type="serviceprovider"
 			name="serviceprovider"
@@ -159,7 +159,7 @@
 			required="true"
 			button="true"
 		/>
-		<!-- [11288] Per Field. Type: Radio. (joomla) -->
+		<!-- [11289] Per Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
 			name="per"
@@ -168,13 +168,13 @@
 			class="btn-group btn-group-yesno"
 			default="1"
 			required="true">
-			<!-- [11360] Option Set. -->
+			<!-- [11361] Option Set. -->
 			<option value="1">
 				COM_COSTBENEFITPROJECTION_COMPANY_OPEN</option>
 			<option value="0">
 				COM_COSTBENEFITPROJECTION_COMPANY_LOCKED</option>
 		</field>
-		<!-- [11374] Medical_turnovers_males Field. Type: Text. (joomla) -->
+		<!-- [11375] Medical_turnovers_males Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="medical_turnovers_males"
@@ -190,7 +190,7 @@
 			message="Error! Please add total number of medical turnovers for males here."
 			hint="COM_COSTBENEFITPROJECTION_COMPANY_MEDICAL_TURNOVERS_MALES_HINT"
 		/>
-		<!-- [11374] Sick_leave_males Field. Type: Text. (joomla) -->
+		<!-- [11375] Sick_leave_males Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="sick_leave_males"
@@ -206,7 +206,7 @@
 			message="Error! Please add total number of sick leave days for males here."
 			hint="COM_COSTBENEFITPROJECTION_COMPANY_SICK_LEAVE_MALES_HINT"
 		/>
-		<!-- [11374] Males Field. Type: Text. (joomla) -->
+		<!-- [11375] Males Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="males"
@@ -222,7 +222,7 @@
 			message="Error! Please add total male employees here."
 			hint="COM_COSTBENEFITPROJECTION_COMPANY_MALES_HINT"
 		/>
-		<!-- [11495] Causesrisks Field. Type: Causesriskscheck. (custom) -->
+		<!-- [11496] Causesrisks Field. Type: Causesriskscheck. (custom) -->
 		<field
 			type="causesriskscheck"
 			name="causesrisks"
@@ -230,9 +230,9 @@
 			class="list_class"
 			required="true"
 		/>
-		<!-- [11388] Age_groups_note Field. Type: Note. A None Database Field. (joomla) -->
+		<!-- [11389] Age_groups_note Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="age_groups_note" label="COM_COSTBENEFITPROJECTION_COMPANY_AGE_GROUPS_NOTE_LABEL" description="COM_COSTBENEFITPROJECTION_COMPANY_AGE_GROUPS_NOTE_DESCRIPTION" class="alert alert-info age_groups_note" />
-		<!-- [11405] Percentfemale Field. Type: Repeatable. (joomla) -->
+		<!-- [11406] Percentfemale Field. Type: Repeatable. (joomla) -->
 		<field
 			type="repeatable"
 			name="percentfemale"
@@ -245,7 +245,7 @@
 			maximum="10">
 			<fields name="percentfemale_fields" label="">
 				<fieldset hidden="true" name="percentfemale_modal" repeat="true">
-					<!-- [11288] Age Field. Type: List. (joomla) -->
+					<!-- [11289] Age Field. Type: List. (joomla) -->
 					<field
 						type="list"
 						name="age"
@@ -253,7 +253,7 @@
 						class="list_class"
 						multiple="false"
 						filter="CMD">
-						<!-- [11360] Option Set. -->
+						<!-- [11361] Option Set. -->
 						<option value="15-19">
 							COM_COSTBENEFITPROJECTION_COMPANY_FIFTEENNINETEEN</option>
 						<option value="20-24">
@@ -275,7 +275,7 @@
 						<option value="60-64">
 							COM_COSTBENEFITPROJECTION_COMPANY_SIXTYSIXTY_FOUR</option>
 					</field>
-					<!-- [11374] Percent Field. Type: Text. (joomla) -->
+					<!-- [11375] Percent Field. Type: Text. (joomla) -->
 					<field
 						type="text"
 						name="percent"
@@ -292,7 +292,7 @@
 				</fieldset>
 			</fields>
 		</field>
-		<!-- [11374] Females Field. Type: Text. (joomla) -->
+		<!-- [11375] Females Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="females"
@@ -308,7 +308,7 @@
 			message="Error! Please add total female employees here."
 			hint="COM_COSTBENEFITPROJECTION_COMPANY_FEMALES_HINT"
 		/>
-		<!-- [11495] Datayear Field. Type: Datayear. (custom) -->
+		<!-- [11496] Datayear Field. Type: Datayear. (custom) -->
 		<field
 			type="datayear"
 			name="datayear"
@@ -318,7 +318,7 @@
 			multiple="false"
 			default="0"
 		/>
-		<!-- [11374] Medical_turnovers_females Field. Type: Text. (joomla) -->
+		<!-- [11375] Medical_turnovers_females Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="medical_turnovers_females"
@@ -334,7 +334,7 @@
 			message="Error! Please add total number of medical turnovers for females here."
 			hint="COM_COSTBENEFITPROJECTION_COMPANY_MEDICAL_TURNOVERS_FEMALES_HINT"
 		/>
-		<!-- [11374] Working_days Field. Type: Integer. (joomla) -->
+		<!-- [11375] Working_days Field. Type: Integer. (joomla) -->
 		<field
 			type="integer"
 			name="working_days"
@@ -347,7 +347,7 @@
 			last="365"
 			step="1"
 		/>
-		<!-- [11374] Sick_leave_females Field. Type: Text. (joomla) -->
+		<!-- [11375] Sick_leave_females Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="sick_leave_females"
@@ -363,7 +363,7 @@
 			message="Error! Please add total number of sick leave days for females here."
 			hint="COM_COSTBENEFITPROJECTION_COMPANY_SICK_LEAVE_FEMALES_HINT"
 		/>
-		<!-- [11374] Total_salary Field. Type: Text. (joomla) -->
+		<!-- [11375] Total_salary Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="total_salary"
@@ -379,7 +379,7 @@
 			message="Error! Please add total salary here."
 			hint="COM_COSTBENEFITPROJECTION_COMPANY_TOTAL_SALARY_HINT"
 		/>
-		<!-- [11405] Percentmale Field. Type: Repeatable. (joomla) -->
+		<!-- [11406] Percentmale Field. Type: Repeatable. (joomla) -->
 		<field
 			type="repeatable"
 			name="percentmale"
@@ -392,7 +392,7 @@
 			maximum="10">
 			<fields name="percentmale_fields" label="">
 				<fieldset hidden="true" name="percentmale_modal" repeat="true">
-					<!-- [11288] Age Field. Type: List. (joomla) -->
+					<!-- [11289] Age Field. Type: List. (joomla) -->
 					<field
 						type="list"
 						name="age"
@@ -400,7 +400,7 @@
 						class="list_class"
 						multiple="false"
 						filter="CMD">
-						<!-- [11360] Option Set. -->
+						<!-- [11361] Option Set. -->
 						<option value="15-19">
 							COM_COSTBENEFITPROJECTION_COMPANY_FIFTEENNINETEEN</option>
 						<option value="20-24">
@@ -422,7 +422,7 @@
 						<option value="60-64">
 							COM_COSTBENEFITPROJECTION_COMPANY_SIXTYSIXTY_FOUR</option>
 					</field>
-					<!-- [11374] Percent Field. Type: Text. (joomla) -->
+					<!-- [11375] Percent Field. Type: Text. (joomla) -->
 					<field
 						type="text"
 						name="percent"
@@ -439,7 +439,7 @@
 				</fieldset>
 			</fields>
 		</field>
-		<!-- [11374] Total_healthcare Field. Type: Text. (joomla) -->
+		<!-- [11375] Total_healthcare Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="total_healthcare"
@@ -455,9 +455,9 @@
 			message="Error! Please add total healthcare costs here."
 			hint="COM_COSTBENEFITPROJECTION_COMPANY_TOTAL_HEALTHCARE_HINT"
 		/>
-		<!-- [11388] Cause_risk_selection_note Field. Type: Note. A None Database Field. (joomla) -->
+		<!-- [11389] Cause_risk_selection_note Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="cause_risk_selection_note" label="COM_COSTBENEFITPROJECTION_COMPANY_CAUSE_RISK_SELECTION_NOTE_LABEL" description="COM_COSTBENEFITPROJECTION_COMPANY_CAUSE_RISK_SELECTION_NOTE_DESCRIPTION" class="alert alert-info cause_risk_selection_note" />
-		<!-- [11374] Productivity_losses Field. Type: Text. (joomla) -->
+		<!-- [11375] Productivity_losses Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="productivity_losses"
@@ -473,7 +473,7 @@
 			message="Error! Please add medical turnover cost factor here."
 			hint="COM_COSTBENEFITPROJECTION_COMPANY_PRODUCTIVITY_LOSSES_HINT"
 		/>
-		<!-- [11374] Not_required Field. Type: Hidden. (joomla) -->
+		<!-- [11375] Not_required Field. Type: Hidden. (joomla) -->
 		<field
 			type="hidden"
 			name="not_required"
@@ -481,15 +481,15 @@
 		/>
 	</fieldset>
 	
-	<!-- [10061] Access Control Fields. -->
+	<!-- [10062] Access Control Fields. -->
 	<fieldset name="accesscontrol">
-		<!-- [10063] Asset Id Field. Type: Hidden (joomla) -->
+		<!-- [10064] Asset Id Field. Type: Hidden (joomla) -->
 		<field
 			name="asset_id"
 			type="hidden"
 			filter="unset"
 		/>
-		<!-- [10069] Rules Field. Type: Rules (joomla) -->
+		<!-- [10070] Rules Field. Type: Rules (joomla) -->
 		<field
 			name="rules"
 			type="rules"
diff --git a/site/models/forms/intervention.js b/site/models/forms/intervention.js
index 704c9de2..074a0512 100644
--- a/site/models/forms/intervention.js
+++ b/site/models/forms/intervention.js
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -17,54 +17,54 @@
 /------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_ugSWqSHmgt_required = false;
+jform_WkmQDwgOQw_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var type_ugSWqSH = jQuery("#jform_type input[type='radio']:checked").val();
-	ugSWqSH(type_ugSWqSH);
+	var type_WkmQDwg = jQuery("#jform_type input[type='radio']:checked").val();
+	WkmQDwg(type_WkmQDwg);
 
-	var type_bnFuIkh = jQuery("#jform_type input[type='radio']:checked").val();
-	bnFuIkh(type_bnFuIkh);
+	var type_rAiqAEp = jQuery("#jform_type input[type='radio']:checked").val();
+	rAiqAEp(type_rAiqAEp);
 });
 
-// the ugSWqSH function
-function ugSWqSH(type_ugSWqSH)
+// the WkmQDwg function
+function WkmQDwg(type_WkmQDwg)
 {
-	// [8016] set the function logic
-	if (type_ugSWqSH == 2)
+	// [8017] set the function logic
+	if (type_WkmQDwg == 2)
 	{
 		jQuery('#jform_interventions').closest('.control-group').show();
-		if (jform_ugSWqSHmgt_required)
+		if (jform_WkmQDwgOQw_required)
 		{
 			updateFieldRequired('interventions',0);
 			jQuery('#jform_interventions').prop('required','required');
 			jQuery('#jform_interventions').attr('aria-required',true);
 			jQuery('#jform_interventions').addClass('required');
-			jform_ugSWqSHmgt_required = false;
+			jform_WkmQDwgOQw_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_interventions').closest('.control-group').hide();
-		if (!jform_ugSWqSHmgt_required)
+		if (!jform_WkmQDwgOQw_required)
 		{
 			updateFieldRequired('interventions',1);
 			jQuery('#jform_interventions').removeAttr('required');
 			jQuery('#jform_interventions').removeAttr('aria-required');
 			jQuery('#jform_interventions').removeClass('required');
-			jform_ugSWqSHmgt_required = true;
+			jform_WkmQDwgOQw_required = true;
 		}
 	}
 }
 
-// the bnFuIkh function
-function bnFuIkh(type_bnFuIkh)
+// the rAiqAEp function
+function rAiqAEp(type_rAiqAEp)
 {
-	// [8016] set the function logic
-	if (type_bnFuIkh == 1)
+	// [8017] set the function logic
+	if (type_rAiqAEp == 1)
 	{
 		jQuery('#jform_intervention').closest('.control-group').show();
 	}
diff --git a/site/models/forms/intervention.xml b/site/models/forms/intervention.xml
index 1a580bf2..cef1c375 100644
--- a/site/models/forms/intervention.xml
+++ b/site/models/forms/intervention.xml
@@ -4,15 +4,15 @@
 	addfieldpath="/administrator/components/com_costbenefitprojection/models/fields"
 >
 	<fieldset name="details">
-		<!-- [11027] Default Fields. -->
-		<!-- [11028] Id Field. Type: Text (joomla) -->
+		<!-- [11028] Default Fields. -->
+		<!-- [11029] Id Field. Type: Text (joomla) -->
 		<field
 			name="id"
 			type="text" class="readonly" label="JGLOBAL_FIELD_ID_LABEL"
 			description ="JGLOBAL_FIELD_ID_DESC" size="10" default="0"
 			readonly="true"
 		/>
-		<!-- [11035] Date Created Field. Type: Calendar (joomla) -->
+		<!-- [11036] Date Created Field. Type: Calendar (joomla) -->
 		<field
 			name="created"
 			type="calendar"
@@ -22,14 +22,14 @@
 			format="%Y-%m-%d %H:%M:%S"
 			filter="user_utc"
 		/>
-		<!-- [11046] User Created Field. Type: User (joomla) -->
+		<!-- [11047] User Created Field. Type: User (joomla) -->
 		<field
 			name="created_by"
 			type="user"
 			label="COM_COSTBENEFITPROJECTION_INTERVENTION_CREATED_BY_LABEL"
 			description="COM_COSTBENEFITPROJECTION_INTERVENTION_CREATED_BY_DESC"
 		/>
-		<!-- [11054] Published Field. Type: List (joomla) -->
+		<!-- [11055] Published Field. Type: List (joomla) -->
 		<field name="published" type="list" label="JSTATUS"
 			description="JFIELD_PUBLISHED_DESC" class="chzn-color-state"
 			filter="intval" size="1" default="1" >
@@ -42,18 +42,18 @@
 			<option value="-2">
 				JTRASHED</option>
 		</field>
-		<!-- [11069] Date Modified Field. Type: Calendar (joomla) -->
+		<!-- [11070] Date Modified Field. Type: Calendar (joomla) -->
 		<field name="modified" type="calendar" class="readonly"
 			label="JGLOBAL_FIELD_MODIFIED_LABEL" description="COM_CONTENT_FIELD_MODIFIED_DESC"
 			size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
-		<!-- [11073] User Modified Field. Type: User (joomla) -->
+		<!-- [11074] User Modified Field. Type: User (joomla) -->
 		<field name="modified_by" type="user"
 			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
 			class="readonly"
 			readonly="true"
 			filter="unset"
 		/>
-		<!-- [11093] Ordering Field. Type: Numbers (joomla) -->
+		<!-- [11094] Ordering Field. Type: Numbers (joomla) -->
 		<field
 			name="ordering"
 			type="number"
@@ -64,7 +64,7 @@
 			size="6"
 			required="false"
 		/>
-		<!-- [11105] Version Field. Type: Text (joomla) -->
+		<!-- [11106] Version Field. Type: Text (joomla) -->
 		<field
 			name="version"
 			type="text"
@@ -75,8 +75,8 @@
 			readonly="true"
 			filter="unset"
 		/>
-		<!-- [11138] Dynamic Fields. -->
-		<!-- [11374] Name Field. Type: Text. (joomla) -->
+		<!-- [11139] Dynamic Fields. -->
+		<!-- [11375] Name Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="name"
@@ -92,7 +92,7 @@
 			message="Error! Please add intervention name here."
 			hint="COM_COSTBENEFITPROJECTION_INTERVENTION_NAME_HINT"
 		/>
-		<!-- [11495] Company Field. Type: Company. (custom) -->
+		<!-- [11496] Company Field. Type: Company. (custom) -->
 		<field
 			type="company"
 			name="company"
@@ -102,7 +102,7 @@
 			default="0"
 			button="true"
 		/>
-		<!-- [11288] Type Field. Type: Radio. (joomla) -->
+		<!-- [11289] Type Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
 			name="type"
@@ -111,13 +111,13 @@
 			class="btn-group"
 			default="1"
 			required="true">
-			<!-- [11360] Option Set. -->
+			<!-- [11361] Option Set. -->
 			<option value="1">
 				COM_COSTBENEFITPROJECTION_INTERVENTION_SINGLE</option>
 			<option value="2">
 				COM_COSTBENEFITPROJECTION_INTERVENTION_CLUSTER</option>
 		</field>
-		<!-- [11374] Coverage Field. Type: Integer. (joomla) -->
+		<!-- [11375] Coverage Field. Type: Integer. (joomla) -->
 		<field
 			type="integer"
 			name="coverage"
@@ -128,7 +128,7 @@
 			last="100"
 			step="10"
 		/>
-		<!-- [11374] Duration Field. Type: Integer. (joomla) -->
+		<!-- [11375] Duration Field. Type: Integer. (joomla) -->
 		<field
 			type="integer"
 			name="duration"
@@ -140,7 +140,7 @@
 			last="20"
 			step="1"
 		/>
-		<!-- [11374] Description Field. Type: Textarea. (joomla) -->
+		<!-- [11375] Description Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
 			name="description"
@@ -152,7 +152,7 @@
 			filter="HTML"
 			hint="COM_COSTBENEFITPROJECTION_INTERVENTION_DESCRIPTION_HINT"
 		/>
-		<!-- [11405] Intervention Field. Type: Repeatable. (joomla) -->
+		<!-- [11406] Intervention Field. Type: Repeatable. (joomla) -->
 		<field
 			type="repeatable"
 			name="intervention"
@@ -165,7 +165,7 @@
 			maximum="100">
 			<fields name="intervention_fields" label="">
 				<fieldset hidden="true" name="intervention_modal" repeat="true">
-					<!-- [11495] Causerisk Field. Type: Causesrisks. (custom) -->
+					<!-- [11496] Causerisk Field. Type: Causesrisks. (custom) -->
 					<field
 						type="causesrisks"
 						name="causerisk"
@@ -175,7 +175,7 @@
 						default="0"
 						button="false"
 					/>
-					<!-- [11374] Cpe Field. Type: Text. (joomla) -->
+					<!-- [11375] Cpe Field. Type: Text. (joomla) -->
 					<field
 						type="text"
 						name="cpe"
@@ -186,7 +186,7 @@
 						class="text_area"
 						filter="INT"
 					/>
-					<!-- [11374] Mbr Field. Type: Text. (joomla) -->
+					<!-- [11375] Mbr Field. Type: Text. (joomla) -->
 					<field
 						type="text"
 						name="mbr"
@@ -197,7 +197,7 @@
 						class="text_area"
 						filter="INT"
 					/>
-					<!-- [11374] Mtr Field. Type: Text. (joomla) -->
+					<!-- [11375] Mtr Field. Type: Text. (joomla) -->
 					<field
 						type="text"
 						name="mtr"
@@ -211,7 +211,7 @@
 				</fieldset>
 			</fields>
 		</field>
-		<!-- [11374] Reference Field. Type: Textarea. (joomla) -->
+		<!-- [11375] Reference Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
 			name="reference"
@@ -223,7 +223,7 @@
 			filter="HTML"
 			hint="COM_COSTBENEFITPROJECTION_INTERVENTION_REFERENCE_HINT"
 		/>
-		<!-- [11495] Interventions Field. Type: Interventions. (custom) -->
+		<!-- [11496] Interventions Field. Type: Interventions. (custom) -->
 		<field
 			type="interventions"
 			name="interventions"
@@ -233,7 +233,7 @@
 			required="true"
 			button="false"
 		/>
-		<!-- [11288] Share Field. Type: List. (joomla) -->
+		<!-- [11289] Share Field. Type: List. (joomla) -->
 		<field
 			type="list"
 			name="share"
@@ -244,7 +244,7 @@
 			filter="INT"
 			required="true"
 			default="3">
-			<!-- [11360] Option Set. -->
+			<!-- [11361] Option Set. -->
 			<option value="3">
 				COM_COSTBENEFITPROJECTION_INTERVENTION_ALL_SERVICE_PROVIDERS_AND_ADMIN</option>
 			<option value="2">
@@ -252,7 +252,7 @@
 			<option value="1">
 				COM_COSTBENEFITPROJECTION_INTERVENTION_ONLY_ME</option>
 		</field>
-		<!-- [11374] Not_required Field. Type: Hidden. (joomla) -->
+		<!-- [11375] Not_required Field. Type: Hidden. (joomla) -->
 		<field
 			type="hidden"
 			name="not_required"
@@ -260,15 +260,15 @@
 		/>
 	</fieldset>
 	
-	<!-- [10061] Access Control Fields. -->
+	<!-- [10062] Access Control Fields. -->
 	<fieldset name="accesscontrol">
-		<!-- [10063] Asset Id Field. Type: Hidden (joomla) -->
+		<!-- [10064] Asset Id Field. Type: Hidden (joomla) -->
 		<field
 			name="asset_id"
 			type="hidden"
 			filter="unset"
 		/>
-		<!-- [10069] Rules Field. Type: Rules (joomla) -->
+		<!-- [10070] Rules Field. Type: Rules (joomla) -->
 		<field
 			name="rules"
 			type="rules"
diff --git a/site/models/forms/scaling_factor.js b/site/models/forms/scaling_factor.js
index 5b6b39b8..4a0e104e 100644
--- a/site/models/forms/scaling_factor.js
+++ b/site/models/forms/scaling_factor.js
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/models/forms/scaling_factor.xml b/site/models/forms/scaling_factor.xml
index f8aa5712..12d74977 100644
--- a/site/models/forms/scaling_factor.xml
+++ b/site/models/forms/scaling_factor.xml
@@ -4,15 +4,15 @@
 	addfieldpath="/administrator/components/com_costbenefitprojection/models/fields"
 >
 	<fieldset name="details">
-		<!-- [11027] Default Fields. -->
-		<!-- [11028] Id Field. Type: Text (joomla) -->
+		<!-- [11028] Default Fields. -->
+		<!-- [11029] Id Field. Type: Text (joomla) -->
 		<field
 			name="id"
 			type="text" class="readonly" label="JGLOBAL_FIELD_ID_LABEL"
 			description ="JGLOBAL_FIELD_ID_DESC" size="10" default="0"
 			readonly="true"
 		/>
-		<!-- [11035] Date Created Field. Type: Calendar (joomla) -->
+		<!-- [11036] Date Created Field. Type: Calendar (joomla) -->
 		<field
 			name="created"
 			type="calendar"
@@ -22,14 +22,14 @@
 			format="%Y-%m-%d %H:%M:%S"
 			filter="user_utc"
 		/>
-		<!-- [11046] User Created Field. Type: User (joomla) -->
+		<!-- [11047] User Created Field. Type: User (joomla) -->
 		<field
 			name="created_by"
 			type="user"
 			label="COM_COSTBENEFITPROJECTION_SCALING_FACTOR_CREATED_BY_LABEL"
 			description="COM_COSTBENEFITPROJECTION_SCALING_FACTOR_CREATED_BY_DESC"
 		/>
-		<!-- [11054] Published Field. Type: List (joomla) -->
+		<!-- [11055] Published Field. Type: List (joomla) -->
 		<field name="published" type="list" label="JSTATUS"
 			description="JFIELD_PUBLISHED_DESC" class="chzn-color-state"
 			filter="intval" size="1" default="1" >
@@ -42,18 +42,18 @@
 			<option value="-2">
 				JTRASHED</option>
 		</field>
-		<!-- [11069] Date Modified Field. Type: Calendar (joomla) -->
+		<!-- [11070] Date Modified Field. Type: Calendar (joomla) -->
 		<field name="modified" type="calendar" class="readonly"
 			label="JGLOBAL_FIELD_MODIFIED_LABEL" description="COM_CONTENT_FIELD_MODIFIED_DESC"
 			size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
-		<!-- [11073] User Modified Field. Type: User (joomla) -->
+		<!-- [11074] User Modified Field. Type: User (joomla) -->
 		<field name="modified_by" type="user"
 			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
 			class="readonly"
 			readonly="true"
 			filter="unset"
 		/>
-		<!-- [11093] Ordering Field. Type: Numbers (joomla) -->
+		<!-- [11094] Ordering Field. Type: Numbers (joomla) -->
 		<field
 			name="ordering"
 			type="number"
@@ -64,7 +64,7 @@
 			size="6"
 			required="false"
 		/>
-		<!-- [11105] Version Field. Type: Text (joomla) -->
+		<!-- [11106] Version Field. Type: Text (joomla) -->
 		<field
 			name="version"
 			type="text"
@@ -75,8 +75,8 @@
 			readonly="true"
 			filter="unset"
 		/>
-		<!-- [11138] Dynamic Fields. -->
-		<!-- [11495] Causerisk Field. Type: Causesrisks. (custom) -->
+		<!-- [11139] Dynamic Fields. -->
+		<!-- [11496] Causerisk Field. Type: Causesrisks. (custom) -->
 		<field
 			type="causesrisks"
 			name="causerisk"
@@ -86,7 +86,7 @@
 			multiple="false"
 			default="0"
 		/>
-		<!-- [11495] Company Field. Type: Company. (custom) -->
+		<!-- [11496] Company Field. Type: Company. (custom) -->
 		<field
 			type="company"
 			name="company"
@@ -96,7 +96,7 @@
 			default="0"
 			button="true"
 		/>
-		<!-- [11374] Reference Field. Type: Textarea. (joomla) -->
+		<!-- [11375] Reference Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
 			name="reference"
@@ -108,7 +108,7 @@
 			filter="HTML"
 			hint="COM_COSTBENEFITPROJECTION_SCALING_FACTOR_REFERENCE_HINT"
 		/>
-		<!-- [11374] Yld_scaling_factor_males Field. Type: Text. (joomla) -->
+		<!-- [11375] Yld_scaling_factor_males Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="yld_scaling_factor_males"
@@ -125,7 +125,7 @@
 			message="Error! Please add scaling factor for males here."
 			hint="COM_COSTBENEFITPROJECTION_SCALING_FACTOR_YLD_SCALING_FACTOR_MALES_HINT"
 		/>
-		<!-- [11374] Yld_scaling_factor_females Field. Type: Text. (joomla) -->
+		<!-- [11375] Yld_scaling_factor_females Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="yld_scaling_factor_females"
@@ -142,7 +142,7 @@
 			message="Error! Please add scaling factor for females here."
 			hint="COM_COSTBENEFITPROJECTION_SCALING_FACTOR_YLD_SCALING_FACTOR_FEMALES_HINT"
 		/>
-		<!-- [11374] Mortality_scaling_factor_males Field. Type: Text. (joomla) -->
+		<!-- [11375] Mortality_scaling_factor_males Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="mortality_scaling_factor_males"
@@ -159,7 +159,7 @@
 			message="Error! Please add scaling factor for males here."
 			hint="COM_COSTBENEFITPROJECTION_SCALING_FACTOR_MORTALITY_SCALING_FACTOR_MALES_HINT"
 		/>
-		<!-- [11374] Mortality_scaling_factor_females Field. Type: Text. (joomla) -->
+		<!-- [11375] Mortality_scaling_factor_females Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="mortality_scaling_factor_females"
@@ -176,7 +176,7 @@
 			message="Error! Please add scaling factor for females here."
 			hint="COM_COSTBENEFITPROJECTION_SCALING_FACTOR_MORTALITY_SCALING_FACTOR_FEMALES_HINT"
 		/>
-		<!-- [11374] Presenteeism_scaling_factor_males Field. Type: Text. (joomla) -->
+		<!-- [11375] Presenteeism_scaling_factor_males Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="presenteeism_scaling_factor_males"
@@ -193,7 +193,7 @@
 			message="Error! Please add scaling factor for males here."
 			hint="COM_COSTBENEFITPROJECTION_SCALING_FACTOR_PRESENTEEISM_SCALING_FACTOR_MALES_HINT"
 		/>
-		<!-- [11374] Presenteeism_scaling_factor_females Field. Type: Text. (joomla) -->
+		<!-- [11375] Presenteeism_scaling_factor_females Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="presenteeism_scaling_factor_females"
@@ -210,7 +210,7 @@
 			message="Error! Please add scaling factor for females here."
 			hint="COM_COSTBENEFITPROJECTION_SCALING_FACTOR_PRESENTEEISM_SCALING_FACTOR_FEMALES_HINT"
 		/>
-		<!-- [11374] Health_scaling_factor Field. Type: Text. (joomla) -->
+		<!-- [11375] Health_scaling_factor Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="health_scaling_factor"
@@ -229,15 +229,15 @@
 		/>
 	</fieldset>
 	
-	<!-- [10061] Access Control Fields. -->
+	<!-- [10062] Access Control Fields. -->
 	<fieldset name="accesscontrol">
-		<!-- [10063] Asset Id Field. Type: Hidden (joomla) -->
+		<!-- [10064] Asset Id Field. Type: Hidden (joomla) -->
 		<field
 			name="asset_id"
 			type="hidden"
 			filter="unset"
 		/>
-		<!-- [10069] Rules Field. Type: Rules (joomla) -->
+		<!-- [10070] Rules Field. Type: Rules (joomla) -->
 		<field
 			name="rules"
 			type="rules"
diff --git a/site/models/intervention.php b/site/models/intervention.php
index 47663373..b938d1b8 100644
--- a/site/models/intervention.php
+++ b/site/models/intervention.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -91,7 +91,7 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 
 			if (!empty($item->interventions))
 			{
-				// [4004] JSON Decode interventions.
+				// [4005] JSON Decode interventions.
 				$item->interventions = json_decode($item->interventions);
 			}
 			
@@ -116,7 +116,7 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 	 * @since   1.6
 	 */
 	public function getForm($data = array(), $loadData = true)
-	{		// [9574] Get the form.
+	{		// [9575] Get the form.
 		$form = $this->loadForm('com_costbenefitprojection.intervention', 'intervention', array('control' => 'jform', 'load_data' => $loadData));
 
 		if (empty($form))
@@ -126,12 +126,12 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 
 		$jinput = JFactory::getApplication()->input;
 
-		// [9659] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first.
+		// [9660] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first.
 		if ($jinput->get('a_id'))
 		{
 			$id = $jinput->get('a_id', 0, 'INT');
 		}
-		// [9664] The back end uses id so we use that the rest of the time and set it to 0 by default.
+		// [9665] The back end uses id so we use that the rest of the time and set it to 0 by default.
 		else
 		{
 			$id = $jinput->get('id', 0, 'INT');
@@ -139,34 +139,34 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 
 		$user = JFactory::getUser();
 
-		// [9670] Check for existing item.
-		// [9671] Modify the form based on Edit State access controls.
+		// [9671] Check for existing item.
+		// [9672] Modify the form based on Edit State access controls.
 		if ($id != 0 && (!$user->authorise('intervention.edit.state', 'com_costbenefitprojection.intervention.' . (int) $id))
 			|| ($id == 0 && !$user->authorise('intervention.edit.state', 'com_costbenefitprojection')))
 		{
-			// [9684] Disable fields for display.
+			// [9685] Disable fields for display.
 			$form->setFieldAttribute('ordering', 'disabled', 'true');
 			$form->setFieldAttribute('published', 'disabled', 'true');
-			// [9687] Disable fields while saving.
+			// [9688] Disable fields while saving.
 			$form->setFieldAttribute('ordering', 'filter', 'unset');
 			$form->setFieldAttribute('published', 'filter', 'unset');
 		}
-		// [9692] Modify the form based on Edit Creaded By access controls.
+		// [9693] Modify the form based on Edit Creaded By access controls.
 		if (!$user->authorise('core.edit.created_by', 'com_costbenefitprojection'))
 		{
-			// [9704] Disable fields for display.
+			// [9705] Disable fields for display.
 			$form->setFieldAttribute('created_by', 'disabled', 'true');
-			// [9706] Disable fields for display.
+			// [9707] Disable fields for display.
 			$form->setFieldAttribute('created_by', 'readonly', 'true');
-			// [9708] Disable fields while saving.
+			// [9709] Disable fields while saving.
 			$form->setFieldAttribute('created_by', 'filter', 'unset');
 		}
-		// [9711] Modify the form based on Edit Creaded Date access controls.
+		// [9712] Modify the form based on Edit Creaded Date access controls.
 		if (!$user->authorise('core.edit.created', 'com_costbenefitprojection'))
 		{
-			// [9723] Disable fields for display.
+			// [9724] Disable fields for display.
 			$form->setFieldAttribute('created', 'disabled', 'true');
-			// [9725] Disable fields while saving.
+			// [9726] Disable fields while saving.
 			$form->setFieldAttribute('created', 'filter', 'unset');
 		}
 
@@ -202,7 +202,7 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 			}
 
 			$user = JFactory::getUser();
-			// [9875] The record has been set. Check the record permissions.
+			// [9876] The record has been set. Check the record permissions.
 			return $user->authorise('intervention.delete', 'com_costbenefitprojection.intervention.' . (int) $record->id);
 		}
 		return false;
@@ -224,14 +224,14 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 
 		if ($recordId)
 		{
-			// [9962] The record has been set. Check the record permissions.
+			// [9963] The record has been set. Check the record permissions.
 			$permission = $user->authorise('intervention.edit.state', 'com_costbenefitprojection.intervention.' . (int) $recordId);
 			if (!$permission && !is_null($permission))
 			{
 				return false;
 			}
 		}
-		// [9979] In the absense of better information, revert to the component permissions.
+		// [9980] In the absense of better information, revert to the component permissions.
 		return $user->authorise('intervention.edit.state', 'com_costbenefitprojection');
 	}
     
@@ -246,7 +246,7 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 	 */
 	protected function allowEdit($data = array(), $key = 'id')
 	{
-		// [9787] Check specific edit permission then general edit permission.
+		// [9788] Check specific edit permission then general edit permission.
 		$user = JFactory::getUser();
 		$recordId	= (int) isset($data[$key]) ? $data[$key] : 0;
 		// get company id
@@ -361,20 +361,20 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 	*/
 	public function validate($form, $data, $group = null)
 	{
-		// [8778] check if the not_required field is set
+		// [8779] check if the not_required field is set
 		if (CostbenefitprojectionHelper::checkString($data['not_required']))
 		{
 			$requiredFields = (array) explode(',',(string) $data['not_required']);
 			$requiredFields = array_unique($requiredFields);
-			// [8783] now change the required field attributes value
+			// [8784] now change the required field attributes value
 			foreach ($requiredFields as $requiredField)
 			{
-				// [8786] make sure there is a string value
+				// [8787] make sure there is a string value
 				if (CostbenefitprojectionHelper::checkString($requiredField))
 				{
-					// [8789] change to false
+					// [8790] change to false
 					$form->setFieldAttribute($requiredField, 'required', 'false');
-					// [8791] also clear the data set
+					// [8792] also clear the data set
 					$data[$requiredField] = '';
 				}
 			}
@@ -505,7 +505,7 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 	{
 		if (empty($this->batchSet))
 		{
-			// [4940] Set some needed variables.
+			// [4941] Set some needed variables.
 			$this->user 		= JFactory::getUser();
 			$this->table 		= $this->getTable();
 			$this->tableClassName	= get_class($this->table);
@@ -563,12 +563,12 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 			}
 		}
 
-		// [4960] get list of uniqe fields
+		// [4961] get list of uniqe fields
 		$uniqeFields = $this->getUniqeFields();
-		// [4962] remove move_copy from array
+		// [4963] remove move_copy from array
 		unset($values['move_copy']);
 
-		// [4965] make sure published is set
+		// [4966] make sure published is set
 		if (!isset($values['published']))
 		{
 			$values['published'] = 0;
@@ -580,21 +580,21 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 
 		$newIds = array();
 
-		// [5002] Parent exists so let's proceed
+		// [5003] Parent exists so let's proceed
 		while (!empty($pks))
 		{
-			// [5005] Pop the first ID off the stack
+			// [5006] Pop the first ID off the stack
 			$pk = array_shift($pks);
 
 			$this->table->reset();
 
-			// [5010] only allow copy if user may edit this item.
+			// [5011] only allow copy if user may edit this item.
 
 			if (!$this->user->authorise('intervention.edit', $contexts[$pk]))
 
 			{
 
-				// [5020] Not fatal error
+				// [5021] Not fatal error
 
 				$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 
@@ -602,19 +602,19 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 
 			}
 
-			// [5025] Check that the row actually exists
+			// [5026] Check that the row actually exists
 			if (!$this->table->load($pk))
 			{
 				if ($error = $this->table->getError())
 				{
-					// [5030] Fatal error
+					// [5031] Fatal error
 					$this->setError($error);
 
 					return false;
 				}
 				else
 				{
-					// [5037] Not fatal error
+					// [5038] Not fatal error
 					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 					continue;
 				}
@@ -622,7 +622,7 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 
 			$this->table->name = $this->generateUniqe('name',$this->table->name);
 
-			// [5073] insert all set values
+			// [5074] insert all set values
 			if (CostbenefitprojectionHelper::checkArray($values))
 			{
 				foreach ($values as $key => $value)
@@ -634,7 +634,7 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 				}
 			}
 
-			// [5085] update all uniqe fields
+			// [5086] update all uniqe fields
 			if (CostbenefitprojectionHelper::checkArray($uniqeFields))
 			{
 				foreach ($uniqeFields as $uniqeField)
@@ -643,13 +643,13 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 				}
 			}
 
-			// [5094] Reset the ID because we are making a copy
+			// [5095] Reset the ID because we are making a copy
 			$this->table->id = 0;
 
-			// [5097] TODO: Deal with ordering?
-			// [5098] $this->table->ordering	= 1;
+			// [5098] TODO: Deal with ordering?
+			// [5099] $this->table->ordering	= 1;
 
-			// [5100] Check the row.
+			// [5101] Check the row.
 			if (!$this->table->check())
 			{
 				$this->setError($this->table->getError());
@@ -662,7 +662,7 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 				$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
 			}
 
-			// [5113] Store the row.
+			// [5114] Store the row.
 			if (!$this->table->store())
 			{
 				$this->setError($this->table->getError());
@@ -670,14 +670,14 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 				return false;
 			}
 
-			// [5121] Get the new item ID
+			// [5122] Get the new item ID
 			$newId = $this->table->get('id');
 
-			// [5124] Add the new ID to the array
+			// [5125] Add the new ID to the array
 			$newIds[$pk] = $newId;
 		}
 
-		// [5128] Clean the cache
+		// [5129] Clean the cache
 		$this->cleanCache();
 
 		return $newIds;
@@ -698,7 +698,7 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 	{
 		if (empty($this->batchSet))
 		{
-			// [4742] Set some needed variables.
+			// [4743] Set some needed variables.
 			$this->user		= JFactory::getUser();
 			$this->table		= $this->getTable();
 			$this->tableClassName	= get_class($this->table);
@@ -757,15 +757,15 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 			}
 		}
 
-		// [4764] make sure published only updates if user has the permission.
+		// [4765] make sure published only updates if user has the permission.
 		if (isset($values['published']) && !$this->canDo->get('intervention.edit.state'))
 		{
 			unset($values['published']);
 		}
-		// [4777] remove move_copy from array
+		// [4778] remove move_copy from array
 		unset($values['move_copy']);
 
-		// [4798] Parent exists so we proceed
+		// [4799] Parent exists so we proceed
 		foreach ($pks as $pk)
 		{
 			if (!$this->user->authorise('intervention.edit', $contexts[$pk]))
@@ -775,30 +775,30 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 				return false;
 			}
 
-			// [4815] Check that the row actually exists
+			// [4816] Check that the row actually exists
 			if (!$this->table->load($pk))
 			{
 				if ($error = $this->table->getError())
 				{
-					// [4820] Fatal error
+					// [4821] Fatal error
 					$this->setError($error);
 
 					return false;
 				}
 				else
 				{
-					// [4827] Not fatal error
+					// [4828] Not fatal error
 					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 					continue;
 				}
 			}
 
-			// [4833] insert all set values.
+			// [4834] insert all set values.
 			if (CostbenefitprojectionHelper::checkArray($values))
 			{
 				foreach ($values as $key => $value)
 				{
-					// [4838] Do special action for access.
+					// [4839] Do special action for access.
 					if ('access' == $key && strlen($value) > 0)
 					{
 						$this->table->$key = $value;
@@ -811,7 +811,7 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 			}
 
 
-			// [4850] Check the row.
+			// [4851] Check the row.
 			if (!$this->table->check())
 			{
 				$this->setError($this->table->getError());
@@ -824,7 +824,7 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 				$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
 			}
 
-			// [4863] Store the row.
+			// [4864] Store the row.
 			if (!$this->table->store())
 			{
 				$this->setError($this->table->getError());
@@ -833,7 +833,7 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 			}
 		}
 
-		// [4872] Clean the cache
+		// [4873] Clean the cache
 		$this->cleanCache();
 
 		return true;
@@ -863,7 +863,7 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 			$data['metadata'] = (string) $metadata;
 		} 
 
-		// [4114] Set the interventions string to JSON string.
+		// [4115] Set the interventions string to JSON string.
 		if (isset($data['interventions']))
 		{
 			$data['interventions'] = (string) json_encode($data['interventions']);
@@ -877,10 +877,10 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 			$data['params'] = (string) $params;
 		}
 
-		// [5220] Alter the uniqe field for save as copy
+		// [5221] Alter the uniqe field for save as copy
 		if ($input->get('task') == 'save2copy')
 		{
-			// [5223] Automatic handling of other uniqe fields
+			// [5224] Automatic handling of other uniqe fields
 			$uniqeFields = $this->getUniqeFields();
 			if (CostbenefitprojectionHelper::checkArray($uniqeFields))
 			{
@@ -933,7 +933,7 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 	protected function _generateNewTitle($title)
 	{
 
-		// [5278] Alter the title
+		// [5279] Alter the title
 		$table = $this->getTable();
 
 		while ($table->load(array('title' => $title)))
diff --git a/site/models/scaling_factor.php b/site/models/scaling_factor.php
index 9be1c36c..89718a7b 100644
--- a/site/models/scaling_factor.php
+++ b/site/models/scaling_factor.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -110,7 +110,7 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 	 * @since   1.6
 	 */
 	public function getForm($data = array(), $loadData = true)
-	{		// [9574] Get the form.
+	{		// [9575] Get the form.
 		$form = $this->loadForm('com_costbenefitprojection.scaling_factor', 'scaling_factor', array('control' => 'jform', 'load_data' => $loadData));
 
 		if (empty($form))
@@ -120,12 +120,12 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 
 		$jinput = JFactory::getApplication()->input;
 
-		// [9659] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first.
+		// [9660] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first.
 		if ($jinput->get('a_id'))
 		{
 			$id = $jinput->get('a_id', 0, 'INT');
 		}
-		// [9664] The back end uses id so we use that the rest of the time and set it to 0 by default.
+		// [9665] The back end uses id so we use that the rest of the time and set it to 0 by default.
 		else
 		{
 			$id = $jinput->get('id', 0, 'INT');
@@ -133,34 +133,34 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 
 		$user = JFactory::getUser();
 
-		// [9670] Check for existing item.
-		// [9671] Modify the form based on Edit State access controls.
+		// [9671] Check for existing item.
+		// [9672] Modify the form based on Edit State access controls.
 		if ($id != 0 && (!$user->authorise('scaling_factor.edit.state', 'com_costbenefitprojection.scaling_factor.' . (int) $id))
 			|| ($id == 0 && !$user->authorise('scaling_factor.edit.state', 'com_costbenefitprojection')))
 		{
-			// [9684] Disable fields for display.
+			// [9685] Disable fields for display.
 			$form->setFieldAttribute('ordering', 'disabled', 'true');
 			$form->setFieldAttribute('published', 'disabled', 'true');
-			// [9687] Disable fields while saving.
+			// [9688] Disable fields while saving.
 			$form->setFieldAttribute('ordering', 'filter', 'unset');
 			$form->setFieldAttribute('published', 'filter', 'unset');
 		}
-		// [9692] Modify the form based on Edit Creaded By access controls.
+		// [9693] Modify the form based on Edit Creaded By access controls.
 		if (!$user->authorise('core.edit.created_by', 'com_costbenefitprojection'))
 		{
-			// [9704] Disable fields for display.
+			// [9705] Disable fields for display.
 			$form->setFieldAttribute('created_by', 'disabled', 'true');
-			// [9706] Disable fields for display.
+			// [9707] Disable fields for display.
 			$form->setFieldAttribute('created_by', 'readonly', 'true');
-			// [9708] Disable fields while saving.
+			// [9709] Disable fields while saving.
 			$form->setFieldAttribute('created_by', 'filter', 'unset');
 		}
-		// [9711] Modify the form based on Edit Creaded Date access controls.
+		// [9712] Modify the form based on Edit Creaded Date access controls.
 		if (!$user->authorise('core.edit.created', 'com_costbenefitprojection'))
 		{
-			// [9723] Disable fields for display.
+			// [9724] Disable fields for display.
 			$form->setFieldAttribute('created', 'disabled', 'true');
-			// [9725] Disable fields while saving.
+			// [9726] Disable fields while saving.
 			$form->setFieldAttribute('created', 'filter', 'unset');
 		}
 
@@ -196,7 +196,7 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 			}
 
 			$user = JFactory::getUser();
-			// [9875] The record has been set. Check the record permissions.
+			// [9876] The record has been set. Check the record permissions.
 			return $user->authorise('scaling_factor.delete', 'com_costbenefitprojection.scaling_factor.' . (int) $record->id);
 		}
 		return false;
@@ -218,14 +218,14 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 
 		if ($recordId)
 		{
-			// [9962] The record has been set. Check the record permissions.
+			// [9963] The record has been set. Check the record permissions.
 			$permission = $user->authorise('scaling_factor.edit.state', 'com_costbenefitprojection.scaling_factor.' . (int) $recordId);
 			if (!$permission && !is_null($permission))
 			{
 				return false;
 			}
 		}
-		// [9979] In the absense of better information, revert to the component permissions.
+		// [9980] In the absense of better information, revert to the component permissions.
 		return $user->authorise('scaling_factor.edit.state', 'com_costbenefitprojection');
 	}
     
@@ -240,7 +240,7 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 	 */
 	protected function allowEdit($data = array(), $key = 'id')
 	{
-		// [9787] Check specific edit permission then general edit permission.
+		// [9788] Check specific edit permission then general edit permission.
 		$user = JFactory::getUser();
 		$recordId	= (int) isset($data[$key]) ? $data[$key] : 0;
 		if (!$user->authorise('core.options', 'com_costbenefitprojection'))
@@ -457,7 +457,7 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 	{
 		if (empty($this->batchSet))
 		{
-			// [4940] Set some needed variables.
+			// [4941] Set some needed variables.
 			$this->user 		= JFactory::getUser();
 			$this->table 		= $this->getTable();
 			$this->tableClassName	= get_class($this->table);
@@ -501,12 +501,12 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 			}
 		}
 
-		// [4960] get list of uniqe fields
+		// [4961] get list of uniqe fields
 		$uniqeFields = $this->getUniqeFields();
-		// [4962] remove move_copy from array
+		// [4963] remove move_copy from array
 		unset($values['move_copy']);
 
-		// [4965] make sure published is set
+		// [4966] make sure published is set
 		if (!isset($values['published']))
 		{
 			$values['published'] = 0;
@@ -518,21 +518,21 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 
 		$newIds = array();
 
-		// [5002] Parent exists so let's proceed
+		// [5003] Parent exists so let's proceed
 		while (!empty($pks))
 		{
-			// [5005] Pop the first ID off the stack
+			// [5006] Pop the first ID off the stack
 			$pk = array_shift($pks);
 
 			$this->table->reset();
 
-			// [5010] only allow copy if user may edit this item.
+			// [5011] only allow copy if user may edit this item.
 
 			if (!$this->user->authorise('scaling_factor.edit', $contexts[$pk]))
 
 			{
 
-				// [5020] Not fatal error
+				// [5021] Not fatal error
 
 				$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 
@@ -540,19 +540,19 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 
 			}
 
-			// [5025] Check that the row actually exists
+			// [5026] Check that the row actually exists
 			if (!$this->table->load($pk))
 			{
 				if ($error = $this->table->getError())
 				{
-					// [5030] Fatal error
+					// [5031] Fatal error
 					$this->setError($error);
 
 					return false;
 				}
 				else
 				{
-					// [5037] Not fatal error
+					// [5038] Not fatal error
 					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 					continue;
 				}
@@ -560,7 +560,7 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 
 			$this->table->causerisk = $this->generateUniqe('causerisk',$this->table->causerisk);
 
-			// [5073] insert all set values
+			// [5074] insert all set values
 			if (CostbenefitprojectionHelper::checkArray($values))
 			{
 				foreach ($values as $key => $value)
@@ -572,7 +572,7 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 				}
 			}
 
-			// [5085] update all uniqe fields
+			// [5086] update all uniqe fields
 			if (CostbenefitprojectionHelper::checkArray($uniqeFields))
 			{
 				foreach ($uniqeFields as $uniqeField)
@@ -581,13 +581,13 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 				}
 			}
 
-			// [5094] Reset the ID because we are making a copy
+			// [5095] Reset the ID because we are making a copy
 			$this->table->id = 0;
 
-			// [5097] TODO: Deal with ordering?
-			// [5098] $this->table->ordering	= 1;
+			// [5098] TODO: Deal with ordering?
+			// [5099] $this->table->ordering	= 1;
 
-			// [5100] Check the row.
+			// [5101] Check the row.
 			if (!$this->table->check())
 			{
 				$this->setError($this->table->getError());
@@ -600,7 +600,7 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 				$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
 			}
 
-			// [5113] Store the row.
+			// [5114] Store the row.
 			if (!$this->table->store())
 			{
 				$this->setError($this->table->getError());
@@ -608,14 +608,14 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 				return false;
 			}
 
-			// [5121] Get the new item ID
+			// [5122] Get the new item ID
 			$newId = $this->table->get('id');
 
-			// [5124] Add the new ID to the array
+			// [5125] Add the new ID to the array
 			$newIds[$pk] = $newId;
 		}
 
-		// [5128] Clean the cache
+		// [5129] Clean the cache
 		$this->cleanCache();
 
 		return $newIds;
@@ -636,7 +636,7 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 	{
 		if (empty($this->batchSet))
 		{
-			// [4742] Set some needed variables.
+			// [4743] Set some needed variables.
 			$this->user		= JFactory::getUser();
 			$this->table		= $this->getTable();
 			$this->tableClassName	= get_class($this->table);
@@ -681,15 +681,15 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 			}
 		}
 
-		// [4764] make sure published only updates if user has the permission.
+		// [4765] make sure published only updates if user has the permission.
 		if (isset($values['published']) && !$this->canDo->get('scaling_factor.edit.state'))
 		{
 			unset($values['published']);
 		}
-		// [4777] remove move_copy from array
+		// [4778] remove move_copy from array
 		unset($values['move_copy']);
 
-		// [4798] Parent exists so we proceed
+		// [4799] Parent exists so we proceed
 		foreach ($pks as $pk)
 		{
 			if (!$this->user->authorise('scaling_factor.edit', $contexts[$pk]))
@@ -699,30 +699,30 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 				return false;
 			}
 
-			// [4815] Check that the row actually exists
+			// [4816] Check that the row actually exists
 			if (!$this->table->load($pk))
 			{
 				if ($error = $this->table->getError())
 				{
-					// [4820] Fatal error
+					// [4821] Fatal error
 					$this->setError($error);
 
 					return false;
 				}
 				else
 				{
-					// [4827] Not fatal error
+					// [4828] Not fatal error
 					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 					continue;
 				}
 			}
 
-			// [4833] insert all set values.
+			// [4834] insert all set values.
 			if (CostbenefitprojectionHelper::checkArray($values))
 			{
 				foreach ($values as $key => $value)
 				{
-					// [4838] Do special action for access.
+					// [4839] Do special action for access.
 					if ('access' == $key && strlen($value) > 0)
 					{
 						$this->table->$key = $value;
@@ -735,7 +735,7 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 			}
 
 
-			// [4850] Check the row.
+			// [4851] Check the row.
 			if (!$this->table->check())
 			{
 				$this->setError($this->table->getError());
@@ -748,7 +748,7 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 				$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
 			}
 
-			// [4863] Store the row.
+			// [4864] Store the row.
 			if (!$this->table->store())
 			{
 				$this->setError($this->table->getError());
@@ -757,7 +757,7 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 			}
 		}
 
-		// [4872] Clean the cache
+		// [4873] Clean the cache
 		$this->cleanCache();
 
 		return true;
@@ -795,10 +795,10 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 			$data['params'] = (string) $params;
 		}
 
-		// [5220] Alter the uniqe field for save as copy
+		// [5221] Alter the uniqe field for save as copy
 		if ($input->get('task') == 'save2copy')
 		{
-			// [5223] Automatic handling of other uniqe fields
+			// [5224] Automatic handling of other uniqe fields
 			$uniqeFields = $this->getUniqeFields();
 			if (CostbenefitprojectionHelper::checkArray($uniqeFields))
 			{
@@ -851,7 +851,7 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 	protected function _generateNewTitle($title)
 	{
 
-		// [5278] Alter the title
+		// [5279] Alter the title
 		$table = $this->getTable();
 
 		while ($table->load(array('title' => $title)))
diff --git a/site/router.php b/site/router.php
index 83115b06..55e8f869 100644
--- a/site/router.php
+++ b/site/router.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/views/combinedresults/tmpl/default.php b/site/views/combinedresults/tmpl/default.php
index 5ef4180b..f5587ec9 100644
--- a/site/views/combinedresults/tmpl/default.php
+++ b/site/views/combinedresults/tmpl/default.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/views/combinedresults/tmpl/default_chart_cost.php b/site/views/combinedresults/tmpl/default_chart_cost.php
index 2ba8537a..0e7454e6 100644
--- a/site/views/combinedresults/tmpl/default_chart_cost.php
+++ b/site/views/combinedresults/tmpl/default_chart_cost.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/views/combinedresults/tmpl/default_chart_cost_percent.php b/site/views/combinedresults/tmpl/default_chart_cost_percent.php
index 8e858677..a6039e5c 100644
--- a/site/views/combinedresults/tmpl/default_chart_cost_percent.php
+++ b/site/views/combinedresults/tmpl/default_chart_cost_percent.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php b/site/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php
index b2d4cf9d..c9fce56f 100644
--- a/site/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php
+++ b/site/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/views/combinedresults/tmpl/default_chart_intervention_cost_benefit_save.php b/site/views/combinedresults/tmpl/default_chart_intervention_cost_benefit_save.php
index a1266026..61c4f25e 100644
--- a/site/views/combinedresults/tmpl/default_chart_intervention_cost_benefit_save.php
+++ b/site/views/combinedresults/tmpl/default_chart_intervention_cost_benefit_save.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/views/combinedresults/tmpl/default_chart_work_days_lost.php b/site/views/combinedresults/tmpl/default_chart_work_days_lost.php
index eb43538f..312ea4e4 100644
--- a/site/views/combinedresults/tmpl/default_chart_work_days_lost.php
+++ b/site/views/combinedresults/tmpl/default_chart_work_days_lost.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php b/site/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php
index 7c513556..ee9c4842 100644
--- a/site/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php
+++ b/site/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php b/site/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php
index 286cfba7..91fec09e 100644
--- a/site/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php
+++ b/site/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/views/combinedresults/tmpl/default_table_cost_summary.php b/site/views/combinedresults/tmpl/default_table_cost_summary.php
index b41f8334..cd345a9d 100644
--- a/site/views/combinedresults/tmpl/default_table_cost_summary.php
+++ b/site/views/combinedresults/tmpl/default_table_cost_summary.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/views/combinedresults/tmpl/default_table_intervention_net_benefit.php b/site/views/combinedresults/tmpl/default_table_intervention_net_benefit.php
index 9ad0c417..826734e6 100644
--- a/site/views/combinedresults/tmpl/default_table_intervention_net_benefit.php
+++ b/site/views/combinedresults/tmpl/default_table_intervention_net_benefit.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/views/combinedresults/tmpl/default_table_work_days_lost_summary.php b/site/views/combinedresults/tmpl/default_table_work_days_lost_summary.php
index 717fcf1a..961af8f2 100644
--- a/site/views/combinedresults/tmpl/default_table_work_days_lost_summary.php
+++ b/site/views/combinedresults/tmpl/default_table_work_days_lost_summary.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/views/combinedresults/view.html.php b/site/views/combinedresults/view.html.php
index 5bd1ddc4..529d0ec0 100644
--- a/site/views/combinedresults/view.html.php
+++ b/site/views/combinedresults/view.html.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -37,10 +37,10 @@ class CostbenefitprojectionViewCombinedresults extends JViewLegacy
 		$this->menu = $this->app->getMenu()->getActive();
 		// get the user object
 		$this->user = JFactory::getUser();
-		// [3043] Initialise variables.
+		// [3044] Initialise variables.
 		$this->items		= $this->get('Items');
 
-		// [3061] Check for errors.
+		// [3062] Check for errors.
 		if (count($errors = $this->get('Errors')))
 		{
 			JError::raiseWarning(500, implode("\n", $errors));
@@ -66,10 +66,10 @@ class CostbenefitprojectionViewCombinedresults extends JViewLegacy
 			$this->item->currency_name = '';
 		}
 
-		// [3078] Set the toolbar
+		// [3079] Set the toolbar
 		$this->addToolBar();
 
-		// [3080] set the document
+		// [3081] set the document
 		$this->_prepareDocument();
 
 		parent::display($tpl);
@@ -81,80 +81,80 @@ class CostbenefitprojectionViewCombinedresults extends JViewLegacy
 	protected function _prepareDocument()
 	{
 
-		// [3430] always make sure jquery is loaded.
+		// [3431] always make sure jquery is loaded.
 		JHtml::_('jquery.framework');
-		// [3432] Load the header checker class.
+		// [3433] Load the header checker class.
 		require_once( JPATH_COMPONENT_SITE.'/helpers/headercheck.php' );
-		// [3434] Initialize the header checker.
+		// [3435] Initialize the header checker.
 		$HeaderCheck = new HeaderCheck;
 
-		// [3439] Load uikit options.
+		// [3440] Load uikit options.
 		$uikit = $this->params->get('uikit_load');
-		// [3441] Set script size.
+		// [3442] Set script size.
 		$size = $this->params->get('uikit_min');
-		// [3443] Set css style.
+		// [3444] Set css style.
 		$style = $this->params->get('uikit_style');
 
-		// [3446] The uikit css.
+		// [3447] The uikit css.
 		if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3)
 		{
 			$this->document->addStyleSheet(JURI::root(true) .'/media/com_costbenefitprojection/uikit/css/uikit'.$style.$size.'.css');
 		}
-		// [3451] The uikit js.
+		// [3452] The uikit js.
 		if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3)
 		{
 			$this->document->addScript(JURI::root(true) .'/media/com_costbenefitprojection/uikit/js/uikit'.$size.'.js');
 		}
 
-		// [3516] Load the needed uikit components in this view.
+		// [3517] Load the needed uikit components in this view.
 		$uikitComp = $this->get('UikitComp');
 		if ($uikit != 2 && isset($uikitComp) && CostbenefitprojectionHelper::checkArray($uikitComp))
 		{
-			// [3520] load just in case.
+			// [3521] load just in case.
 			jimport('joomla.filesystem.file');
-			// [3522] loading...
+			// [3523] loading...
 			foreach ($uikitComp as $class)
 			{
 				foreach (CostbenefitprojectionHelper::$uk_components[$class] as $name)
 				{
-					// [3527] check if the CSS file exists.
+					// [3528] check if the CSS file exists.
 					if (JFile::exists(JPATH_ROOT.'/media/com_costbenefitprojection/uikit/css/components/'.$name.$style.$size.'.css'))
 					{
-						// [3530] load the css.
+						// [3531] load the css.
 						$this->document->addStyleSheet(JURI::root(true) .'/media/com_costbenefitprojection/uikit/css/components/'.$name.$style.$size.'.css');
 					}
-					// [3533] check if the JavaScript file exists.
+					// [3534] check if the JavaScript file exists.
 					if (JFile::exists(JPATH_ROOT.'/media/com_costbenefitprojection/uikit/js/components/'.$name.$size.'.js'))
 					{
-						// [3536] load the js.
+						// [3537] load the js.
 						$this->document->addScript(JURI::root(true) .'/media/com_costbenefitprojection/uikit/js/components/'.$name.$size.'.js');
 					}
 				}
 			}
 		} 
 
-		// [3412] add the google chart builder class.
+		// [3413] add the google chart builder class.
 		require_once JPATH_COMPONENT_ADMINISTRATOR.'/helpers/chartbuilder.php';
-		// [3414] load the google chart js.
+		// [3415] load the google chart js.
 		$this->document->addScript(JURI::root(true) .'/media/com_costbenefitprojection/js/google.jsapi.js');
 		$this->document->addScript('https://canvg.googlecode.com/svn/trunk/rgbcolor.js');
 		$this->document->addScript('https://canvg.googlecode.com/svn/trunk/canvg.js'); 
 
-		// [6522] Add the CSS for Footable.
+		// [6523] Add the CSS for Footable.
 		$this->document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable/css/footable.core.min.css');
 
-		// [6524] Use the Metro Style
+		// [6525] Use the Metro Style
 		if (!isset($this->fooTableStyle) || 0 == $this->fooTableStyle)
 		{
 			$this->document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable/css/footable.metro.min.css');
 		}
-		// [6529] Use the Legacy Style.
+		// [6530] Use the Legacy Style.
 		elseif (isset($this->fooTableStyle) && 1 == $this->fooTableStyle)
 		{
 			$this->document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable/css/footable.standalone.min.css');
 		}
 
-		// [6534] Add the JavaScript for Footable
+		// [6535] Add the JavaScript for Footable
 		$this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable/js/footable.js');
 		$this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable/js/footable.sort.js');
 		$this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable/js/footable.filter.js');
diff --git a/site/views/company/submitbutton.js b/site/views/company/submitbutton.js
index 1503d933..5cc027b0 100644
--- a/site/views/company/submitbutton.js
+++ b/site/views/company/submitbutton.js
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/views/company/tmpl/edit.php b/site/views/company/tmpl/edit.php
index 9946ae0a..692f6c94 100644
--- a/site/views/company/tmpl/edit.php
+++ b/site/views/company/tmpl/edit.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -137,33 +137,33 @@ $componentParams = JComponentHelper::getParams('com_costbenefitprojection');
 
 <script type="text/javascript">
 
-// #jform_department listeners for department_MyenDgD function
+// #jform_department listeners for department_pydRZWr function
 jQuery('#jform_department').on('keyup',function()
 {
-	var department_MyenDgD = jQuery("#jform_department input[type='radio']:checked").val();
-	MyenDgD(department_MyenDgD);
+	var department_pydRZWr = jQuery("#jform_department input[type='radio']:checked").val();
+	pydRZWr(department_pydRZWr);
 
 });
 jQuery('#adminForm').on('change', '#jform_department',function (e)
 {
 	e.preventDefault();
-	var department_MyenDgD = jQuery("#jform_department input[type='radio']:checked").val();
-	MyenDgD(department_MyenDgD);
+	var department_pydRZWr = jQuery("#jform_department input[type='radio']:checked").val();
+	pydRZWr(department_pydRZWr);
 
 });
 
-// #jform_department listeners for department_JKkommy function
+// #jform_department listeners for department_sAKFZSC function
 jQuery('#jform_department').on('keyup',function()
 {
-	var department_JKkommy = jQuery("#jform_department input[type='radio']:checked").val();
-	JKkommy(department_JKkommy);
+	var department_sAKFZSC = jQuery("#jform_department input[type='radio']:checked").val();
+	sAKFZSC(department_sAKFZSC);
 
 });
 jQuery('#adminForm').on('change', '#jform_department',function (e)
 {
 	e.preventDefault();
-	var department_JKkommy = jQuery("#jform_department input[type='radio']:checked").val();
-	JKkommy(department_JKkommy);
+	var department_sAKFZSC = jQuery("#jform_department input[type='radio']:checked").val();
+	sAKFZSC(department_sAKFZSC);
 
 });
 
diff --git a/site/views/company/view.html.php b/site/views/company/view.html.php
index dae804ce..4bde39f5 100644
--- a/site/views/company/view.html.php
+++ b/site/views/company/view.html.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -64,11 +64,11 @@ class CostbenefitprojectionViewCompany extends JViewLegacy
                         $this->referral = '&ref='.(string)$this->ref;
                 }
 
-		// [6487] Get Linked view data
-		$this->oabscaling_factors		= $this->get('Oabscaling_factors');
+		// [6488] Get Linked view data
+		$this->yosscaling_factors		= $this->get('Yosscaling_factors');
 
-		// [6487] Get Linked view data
-		$this->ljeinterventions		= $this->get('Ljeinterventions');
+		// [6488] Get Linked view data
+		$this->zjtinterventions		= $this->get('Zjtinterventions');
 
 		// Set the toolbar
 		$this->addToolBar();
@@ -94,27 +94,27 @@ class CostbenefitprojectionViewCompany extends JViewLegacy
 		$isNew = $this->item->id == 0;
 
 		JToolbarHelper::title( JText::_($isNew ? 'COM_COSTBENEFITPROJECTION_COMPANY_NEW' : 'COM_COSTBENEFITPROJECTION_COMPANY_EDIT'), 'pencil-2 article-add');
-		// [10277] Built the actions for new and existing records.
+		// [10278] Built the actions for new and existing records.
 		if ($this->refid || $this->ref)
 		{
 			if ($this->canDo->get('company.create') && $isNew)
 			{
-				// [10289] We can create the record.
+				// [10290] We can create the record.
 				JToolBarHelper::save('company.save', 'JTOOLBAR_SAVE');
 			}
 			elseif ($this->canDo->get('company.edit'))
 			{
-				// [10301] We can save the record.
+				// [10302] We can save the record.
 				JToolBarHelper::save('company.save', 'JTOOLBAR_SAVE');
 			}
 			if ($isNew)
 			{
-				// [10306] Do not creat but cancel.
+				// [10307] Do not creat but cancel.
 				JToolBarHelper::cancel('company.cancel', 'JTOOLBAR_CANCEL');
 			}
 			else
 			{
-				// [10311] We can close it.
+				// [10312] We can close it.
 				JToolBarHelper::cancel('company.cancel', 'JTOOLBAR_CLOSE');
 			}
 		}
@@ -122,7 +122,7 @@ class CostbenefitprojectionViewCompany extends JViewLegacy
 		{
 			if ($isNew)
 			{
-				// [10319] For new records, check the create permission.
+				// [10320] For new records, check the create permission.
 				if ($this->canDo->get('company.create'))
 				{
 					JToolBarHelper::apply('company.apply', 'JTOOLBAR_APPLY');
@@ -135,11 +135,11 @@ class CostbenefitprojectionViewCompany extends JViewLegacy
 			{
 				if ($this->canDo->get('company.edit'))
 				{
-					// [10346] We can save the new record
+					// [10347] We can save the new record
 					JToolBarHelper::apply('company.apply', 'JTOOLBAR_APPLY');
 					JToolBarHelper::save('company.save', 'JTOOLBAR_SAVE');
-					// [10349] We can save this record, but check the create permission to see
-					// [10350] if we can return to make a new one.
+					// [10350] We can save this record, but check the create permission to see
+					// [10351] if we can return to make a new one.
 					if ($this->canDo->get('company.create'))
 					{
 						JToolBarHelper::custom('company.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
@@ -158,7 +158,7 @@ class CostbenefitprojectionViewCompany extends JViewLegacy
 			}
 		}
 		JToolbarHelper::divider();
-		// [10386] set help url for this view if found
+		// [10387] set help url for this view if found
 		$help_url = CostbenefitprojectionHelper::getHelpUrl('company');
 		if (CostbenefitprojectionHelper::checkString($help_url))
 		{
@@ -202,21 +202,21 @@ class CostbenefitprojectionViewCompany extends JViewLegacy
 		// the default style of this view
 		$document->addStyleSheet(JURI::root()."components/com_costbenefitprojection/assets/css/company.css"); 
 
-		// [6522] Add the CSS for Footable.
+		// [6523] Add the CSS for Footable.
 		$document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable/css/footable.core.min.css');
 
-		// [6524] Use the Metro Style
+		// [6525] Use the Metro Style
 		if (!isset($this->fooTableStyle) || 0 == $this->fooTableStyle)
 		{
 			$document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable/css/footable.metro.min.css');
 		}
-		// [6529] Use the Legacy Style.
+		// [6530] Use the Legacy Style.
 		elseif (isset($this->fooTableStyle) && 1 == $this->fooTableStyle)
 		{
 			$document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable/css/footable.standalone.min.css');
 		}
 
-		// [6534] Add the JavaScript for Footable
+		// [6535] Add the JavaScript for Footable
 		$document->addScript(JURI::root() .'media/com_costbenefitprojection/footable/js/footable.js');
 		$document->addScript(JURI::root() .'media/com_costbenefitprojection/footable/js/footable.sort.js');
 		$document->addScript(JURI::root() .'media/com_costbenefitprojection/footable/js/footable.filter.js');
diff --git a/site/views/companyresults/tmpl/default.php b/site/views/companyresults/tmpl/default.php
index da9b29a2..41279ff0 100644
--- a/site/views/companyresults/tmpl/default.php
+++ b/site/views/companyresults/tmpl/default.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/views/companyresults/tmpl/default_chart_cost.php b/site/views/companyresults/tmpl/default_chart_cost.php
index 2ba8537a..0e7454e6 100644
--- a/site/views/companyresults/tmpl/default_chart_cost.php
+++ b/site/views/companyresults/tmpl/default_chart_cost.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/views/companyresults/tmpl/default_chart_cost_percent.php b/site/views/companyresults/tmpl/default_chart_cost_percent.php
index 8e858677..a6039e5c 100644
--- a/site/views/companyresults/tmpl/default_chart_cost_percent.php
+++ b/site/views/companyresults/tmpl/default_chart_cost_percent.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php b/site/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php
index b2d4cf9d..c9fce56f 100644
--- a/site/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php
+++ b/site/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/views/companyresults/tmpl/default_chart_intervention_cost_benefit_save.php b/site/views/companyresults/tmpl/default_chart_intervention_cost_benefit_save.php
index a1266026..61c4f25e 100644
--- a/site/views/companyresults/tmpl/default_chart_intervention_cost_benefit_save.php
+++ b/site/views/companyresults/tmpl/default_chart_intervention_cost_benefit_save.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/views/companyresults/tmpl/default_chart_work_days_lost.php b/site/views/companyresults/tmpl/default_chart_work_days_lost.php
index eb43538f..312ea4e4 100644
--- a/site/views/companyresults/tmpl/default_chart_work_days_lost.php
+++ b/site/views/companyresults/tmpl/default_chart_work_days_lost.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/views/companyresults/tmpl/default_chart_work_days_lost_percent.php b/site/views/companyresults/tmpl/default_chart_work_days_lost_percent.php
index 7c513556..ee9c4842 100644
--- a/site/views/companyresults/tmpl/default_chart_work_days_lost_percent.php
+++ b/site/views/companyresults/tmpl/default_chart_work_days_lost_percent.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php b/site/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php
index 286cfba7..91fec09e 100644
--- a/site/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php
+++ b/site/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/views/companyresults/tmpl/default_table_cost_summary.php b/site/views/companyresults/tmpl/default_table_cost_summary.php
index b41f8334..cd345a9d 100644
--- a/site/views/companyresults/tmpl/default_table_cost_summary.php
+++ b/site/views/companyresults/tmpl/default_table_cost_summary.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/views/companyresults/tmpl/default_table_intervention_net_benefit.php b/site/views/companyresults/tmpl/default_table_intervention_net_benefit.php
index 9ad0c417..826734e6 100644
--- a/site/views/companyresults/tmpl/default_table_intervention_net_benefit.php
+++ b/site/views/companyresults/tmpl/default_table_intervention_net_benefit.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/views/companyresults/tmpl/default_table_work_days_lost_summary.php b/site/views/companyresults/tmpl/default_table_work_days_lost_summary.php
index 717fcf1a..961af8f2 100644
--- a/site/views/companyresults/tmpl/default_table_work_days_lost_summary.php
+++ b/site/views/companyresults/tmpl/default_table_work_days_lost_summary.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/views/companyresults/view.html.php b/site/views/companyresults/view.html.php
index 3a9d228e..24c21a86 100644
--- a/site/views/companyresults/view.html.php
+++ b/site/views/companyresults/view.html.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -37,10 +37,10 @@ class CostbenefitprojectionViewCompanyresults extends JViewLegacy
 		$this->menu = $this->app->getMenu()->getActive();
 		// get the user object
 		$this->user = JFactory::getUser();
-		// [3037] Initialise variables.
+		// [3038] Initialise variables.
 		$this->item	= $this->get('Item');
 
-		// [3061] Check for errors.
+		// [3062] Check for errors.
 		if (count($errors = $this->get('Errors')))
 		{
 			JError::raiseWarning(500, implode("\n", $errors));
@@ -59,10 +59,10 @@ class CostbenefitprojectionViewCompanyresults extends JViewLegacy
 			$this->results = false;
 		}
 
-		// [3078] Set the toolbar
+		// [3079] Set the toolbar
 		$this->addToolBar();
 
-		// [3080] set the document
+		// [3081] set the document
 		$this->_prepareDocument();
 
 		parent::display($tpl);
@@ -74,80 +74,80 @@ class CostbenefitprojectionViewCompanyresults extends JViewLegacy
 	protected function _prepareDocument()
 	{
 
-		// [3430] always make sure jquery is loaded.
+		// [3431] always make sure jquery is loaded.
 		JHtml::_('jquery.framework');
-		// [3432] Load the header checker class.
+		// [3433] Load the header checker class.
 		require_once( JPATH_COMPONENT_SITE.'/helpers/headercheck.php' );
-		// [3434] Initialize the header checker.
+		// [3435] Initialize the header checker.
 		$HeaderCheck = new HeaderCheck;
 
-		// [3439] Load uikit options.
+		// [3440] Load uikit options.
 		$uikit = $this->params->get('uikit_load');
-		// [3441] Set script size.
+		// [3442] Set script size.
 		$size = $this->params->get('uikit_min');
-		// [3443] Set css style.
+		// [3444] Set css style.
 		$style = $this->params->get('uikit_style');
 
-		// [3446] The uikit css.
+		// [3447] The uikit css.
 		if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3)
 		{
 			$this->document->addStyleSheet(JURI::root(true) .'/media/com_costbenefitprojection/uikit/css/uikit'.$style.$size.'.css');
 		}
-		// [3451] The uikit js.
+		// [3452] The uikit js.
 		if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3)
 		{
 			$this->document->addScript(JURI::root(true) .'/media/com_costbenefitprojection/uikit/js/uikit'.$size.'.js');
 		}
 
-		// [3516] Load the needed uikit components in this view.
+		// [3517] Load the needed uikit components in this view.
 		$uikitComp = $this->get('UikitComp');
 		if ($uikit != 2 && isset($uikitComp) && CostbenefitprojectionHelper::checkArray($uikitComp))
 		{
-			// [3520] load just in case.
+			// [3521] load just in case.
 			jimport('joomla.filesystem.file');
-			// [3522] loading...
+			// [3523] loading...
 			foreach ($uikitComp as $class)
 			{
 				foreach (CostbenefitprojectionHelper::$uk_components[$class] as $name)
 				{
-					// [3527] check if the CSS file exists.
+					// [3528] check if the CSS file exists.
 					if (JFile::exists(JPATH_ROOT.'/media/com_costbenefitprojection/uikit/css/components/'.$name.$style.$size.'.css'))
 					{
-						// [3530] load the css.
+						// [3531] load the css.
 						$this->document->addStyleSheet(JURI::root(true) .'/media/com_costbenefitprojection/uikit/css/components/'.$name.$style.$size.'.css');
 					}
-					// [3533] check if the JavaScript file exists.
+					// [3534] check if the JavaScript file exists.
 					if (JFile::exists(JPATH_ROOT.'/media/com_costbenefitprojection/uikit/js/components/'.$name.$size.'.js'))
 					{
-						// [3536] load the js.
+						// [3537] load the js.
 						$this->document->addScript(JURI::root(true) .'/media/com_costbenefitprojection/uikit/js/components/'.$name.$size.'.js');
 					}
 				}
 			}
 		} 
 
-		// [3412] add the google chart builder class.
+		// [3413] add the google chart builder class.
 		require_once JPATH_COMPONENT_ADMINISTRATOR.'/helpers/chartbuilder.php';
-		// [3414] load the google chart js.
+		// [3415] load the google chart js.
 		$this->document->addScript(JURI::root(true) .'/media/com_costbenefitprojection/js/google.jsapi.js');
 		$this->document->addScript('https://canvg.googlecode.com/svn/trunk/rgbcolor.js');
 		$this->document->addScript('https://canvg.googlecode.com/svn/trunk/canvg.js'); 
 
-		// [6522] Add the CSS for Footable.
+		// [6523] Add the CSS for Footable.
 		$this->document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable/css/footable.core.min.css');
 
-		// [6524] Use the Metro Style
+		// [6525] Use the Metro Style
 		if (!isset($this->fooTableStyle) || 0 == $this->fooTableStyle)
 		{
 			$this->document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable/css/footable.metro.min.css');
 		}
-		// [6529] Use the Legacy Style.
+		// [6530] Use the Legacy Style.
 		elseif (isset($this->fooTableStyle) && 1 == $this->fooTableStyle)
 		{
 			$this->document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable/css/footable.standalone.min.css');
 		}
 
-		// [6534] Add the JavaScript for Footable
+		// [6535] Add the JavaScript for Footable
 		$this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable/js/footable.js');
 		$this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable/js/footable.sort.js');
 		$this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable/js/footable.filter.js');
diff --git a/site/views/cpanel/tmpl/default.php b/site/views/cpanel/tmpl/default.php
index a45b8dca..19f4df3c 100644
--- a/site/views/cpanel/tmpl/default.php
+++ b/site/views/cpanel/tmpl/default.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/views/cpanel/view.html.php b/site/views/cpanel/view.html.php
index 4e2d65ee..d6b59242 100644
--- a/site/views/cpanel/view.html.php
+++ b/site/views/cpanel/view.html.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -37,20 +37,20 @@ class CostbenefitprojectionViewCpanel extends JViewLegacy
 		$this->menu = $this->app->getMenu()->getActive();
 		// get the user object
 		$this->user = JFactory::getUser();
-		// [3043] Initialise variables.
+		// [3044] Initialise variables.
 		$this->items		= $this->get('Items');
 
-		// [3061] Check for errors.
+		// [3062] Check for errors.
 		if (count($errors = $this->get('Errors')))
 		{
 			JError::raiseWarning(500, implode("\n", $errors));
 			return false;
 		}
 
-		// [3078] Set the toolbar
+		// [3079] Set the toolbar
 		$this->addToolBar();
 
-		// [3080] set the document
+		// [3081] set the document
 		$this->_prepareDocument();
 
 		parent::display($tpl);
@@ -62,42 +62,42 @@ class CostbenefitprojectionViewCpanel extends JViewLegacy
 	protected function _prepareDocument()
 	{
 
-		// [3430] always make sure jquery is loaded.
+		// [3431] always make sure jquery is loaded.
 		JHtml::_('jquery.framework');
-		// [3432] Load the header checker class.
+		// [3433] Load the header checker class.
 		require_once( JPATH_COMPONENT_SITE.'/helpers/headercheck.php' );
-		// [3434] Initialize the header checker.
+		// [3435] Initialize the header checker.
 		$HeaderCheck = new HeaderCheck;
 
-		// [3439] Load uikit options.
+		// [3440] Load uikit options.
 		$uikit = $this->params->get('uikit_load');
-		// [3441] Set script size.
+		// [3442] Set script size.
 		$size = $this->params->get('uikit_min');
-		// [3443] Set css style.
+		// [3444] Set css style.
 		$style = $this->params->get('uikit_style');
 
-		// [3446] The uikit css.
+		// [3447] The uikit css.
 		if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3)
 		{
 			$this->document->addStyleSheet(JURI::root(true) .'/media/com_costbenefitprojection/uikit/css/uikit'.$style.$size.'.css');
 		}
-		// [3451] The uikit js.
+		// [3452] The uikit js.
 		if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3)
 		{
 			$this->document->addScript(JURI::root(true) .'/media/com_costbenefitprojection/uikit/js/uikit'.$size.'.js');
 		}
 
-		// [3460] Load the script to find all uikit components needed.
+		// [3461] Load the script to find all uikit components needed.
 		if ($uikit != 2)
 		{
-			// [3463] Set the default uikit components in this view.
+			// [3464] Set the default uikit components in this view.
 			$uikitComp = array();
+			$uikitComp[] = 'data-uk-tooltip';
 			$uikitComp[] = 'data-uk-grid';
 			$uikitComp[] = 'uk-accordion';
 			$uikitComp[] = 'data-uk-lightbox';
-			$uikitComp[] = 'data-uk-tooltip';
 
-			// [3472] Get field uikit components needed in this view.
+			// [3473] Get field uikit components needed in this view.
 			$uikitFieldComp = $this->get('UikitComp');
 			if (isset($uikitFieldComp) && CostbenefitprojectionHelper::checkArray($uikitFieldComp))
 			{
@@ -113,69 +113,69 @@ class CostbenefitprojectionViewCpanel extends JViewLegacy
 			}
 		}
 
-		// [3488] Load the needed uikit components in this view.
+		// [3489] Load the needed uikit components in this view.
 		if ($uikit != 2 && isset($uikitComp) && CostbenefitprojectionHelper::checkArray($uikitComp))
 		{
-			// [3491] load just in case.
+			// [3492] load just in case.
 			jimport('joomla.filesystem.file');
-			// [3493] loading...
+			// [3494] loading...
 			foreach ($uikitComp as $class)
 			{
 				foreach (CostbenefitprojectionHelper::$uk_components[$class] as $name)
 				{
-					// [3498] check if the CSS file exists.
+					// [3499] check if the CSS file exists.
 					if (JFile::exists(JPATH_ROOT.'/media/com_costbenefitprojection/uikit/css/components/'.$name.$style.$size.'.css'))
 					{
-						// [3501] load the css.
+						// [3502] load the css.
 						$this->document->addStyleSheet(JURI::root(true) .'/media/com_costbenefitprojection/uikit/css/components/'.$name.$style.$size.'.css');
 					}
-					// [3504] check if the JavaScript file exists.
+					// [3505] check if the JavaScript file exists.
 					if (JFile::exists(JPATH_ROOT.'/media/com_costbenefitprojection/uikit/js/components/'.$name.$size.'.js'))
 					{
-						// [3507] load the js.
+						// [3508] load the js.
 						$this->document->addScript(JURI::root(true) .'/media/com_costbenefitprojection/uikit/js/components/'.$name.$size.'.js');
 					}
 				}
 			}
 		} 
 
-		// [3412] add the google chart builder class.
+		// [3413] add the google chart builder class.
 		require_once JPATH_COMPONENT_ADMINISTRATOR.'/helpers/chartbuilder.php';
-		// [3414] load the google chart js.
+		// [3415] load the google chart js.
 		$this->document->addScript(JURI::root(true) .'/media/com_costbenefitprojection/js/google.jsapi.js');
 		$this->document->addScript('https://canvg.googlecode.com/svn/trunk/rgbcolor.js');
 		$this->document->addScript('https://canvg.googlecode.com/svn/trunk/canvg.js'); 
 
-		// [6522] Add the CSS for Footable.
+		// [6523] Add the CSS for Footable.
 		$this->document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable/css/footable.core.min.css');
 
-		// [6524] Use the Metro Style
+		// [6525] Use the Metro Style
 		if (!isset($this->fooTableStyle) || 0 == $this->fooTableStyle)
 		{
 			$this->document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable/css/footable.metro.min.css');
 		}
-		// [6529] Use the Legacy Style.
+		// [6530] Use the Legacy Style.
 		elseif (isset($this->fooTableStyle) && 1 == $this->fooTableStyle)
 		{
 			$this->document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable/css/footable.standalone.min.css');
 		}
 
-		// [6534] Add the JavaScript for Footable
+		// [6535] Add the JavaScript for Footable
 		$this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable/js/footable.js');
 		$this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable/js/footable.sort.js');
 		$this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable/js/footable.filter.js');
 		$this->document->addScript(JURI::root() .'media/com_costbenefitprojection/footable/js/footable.paginate.js'); 
-		// [3388] load the meta description
+		// [3389] load the meta description
 		if ($this->params->get('menu-meta_description'))
 		{
 			$this->document->setDescription($this->params->get('menu-meta_description'));
 		}
-		// [3393] load the key words if set
+		// [3394] load the key words if set
 		if ($this->params->get('menu-meta_keywords'))
 		{
 			$this->document->setMetadata('keywords', $this->params->get('menu-meta_keywords'));
 		}
-		// [3398] check the robot params
+		// [3399] check the robot params
 		if ($this->params->get('robots'))
 		{
 			$this->document->setMetadata('robots', $this->params->get('robots'));
diff --git a/site/views/createaccount/tmpl/default.php b/site/views/createaccount/tmpl/default.php
index 5fb8598a..acbe4002 100644
--- a/site/views/createaccount/tmpl/default.php
+++ b/site/views/createaccount/tmpl/default.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -55,7 +55,7 @@ if ($this->items)
 			}
 			else
 			{
-				$serviceList[] = '<li aria-hidden="true" class=""><div class="uk-accordion" data-uk-accordion="{showfirst:false}">'.  implode('', $bucket).'</div></li>';
+				$serviceList[] = '<li aria-hidden="true" class="" data-uk-check-display><div class="uk-accordion" data-uk-accordion="{showfirst:false}">'.  implode('', $bucket).'</div></li>';
 			}
 		}
 		else
diff --git a/site/views/createaccount/view.html.php b/site/views/createaccount/view.html.php
index 0f2388ee..3ef7123c 100644
--- a/site/views/createaccount/view.html.php
+++ b/site/views/createaccount/view.html.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -37,20 +37,20 @@ class CostbenefitprojectionViewCreateaccount extends JViewLegacy
 		$this->menu = $this->app->getMenu()->getActive();
 		// get the user object
 		$this->user = JFactory::getUser();
-		// [3043] Initialise variables.
+		// [3044] Initialise variables.
 		$this->items		= $this->get('Items');
 
-		// [3061] Check for errors.
+		// [3062] Check for errors.
 		if (count($errors = $this->get('Errors')))
 		{
 			JError::raiseWarning(500, implode("\n", $errors));
 			return false;
 		}
 
-		// [3078] Set the toolbar
+		// [3079] Set the toolbar
 		$this->addToolBar();
 
-		// [3080] set the document
+		// [3081] set the document
 		$this->_prepareDocument();
 
 		parent::display($tpl);
@@ -101,39 +101,40 @@ class CostbenefitprojectionViewCreateaccount extends JViewLegacy
 	protected function _prepareDocument()
 	{
 
-		// [3430] always make sure jquery is loaded.
+		// [3431] always make sure jquery is loaded.
 		JHtml::_('jquery.framework');
-		// [3432] Load the header checker class.
+		// [3433] Load the header checker class.
 		require_once( JPATH_COMPONENT_SITE.'/helpers/headercheck.php' );
-		// [3434] Initialize the header checker.
+		// [3435] Initialize the header checker.
 		$HeaderCheck = new HeaderCheck;
 
-		// [3439] Load uikit options.
+		// [3440] Load uikit options.
 		$uikit = $this->params->get('uikit_load');
-		// [3441] Set script size.
+		// [3442] Set script size.
 		$size = $this->params->get('uikit_min');
-		// [3443] Set css style.
+		// [3444] Set css style.
 		$style = $this->params->get('uikit_style');
 
-		// [3446] The uikit css.
+		// [3447] The uikit css.
 		if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3)
 		{
 			$this->document->addStyleSheet(JURI::root(true) .'/media/com_costbenefitprojection/uikit/css/uikit'.$style.$size.'.css');
 		}
-		// [3451] The uikit js.
+		// [3452] The uikit js.
 		if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3)
 		{
 			$this->document->addScript(JURI::root(true) .'/media/com_costbenefitprojection/uikit/js/uikit'.$size.'.js');
 		}
 
-		// [3460] Load the script to find all uikit components needed.
+		// [3461] Load the script to find all uikit components needed.
 		if ($uikit != 2)
 		{
-			// [3463] Set the default uikit components in this view.
+			// [3464] Set the default uikit components in this view.
 			$uikitComp = array();
+			$uikitComp[] = 'uk-accordion';
 			$uikitComp[] = 'data-uk-grid';
 
-			// [3472] Get field uikit components needed in this view.
+			// [3473] Get field uikit components needed in this view.
 			$uikitFieldComp = $this->get('UikitComp');
 			if (isset($uikitFieldComp) && CostbenefitprojectionHelper::checkArray($uikitFieldComp))
 			{
@@ -149,26 +150,26 @@ class CostbenefitprojectionViewCreateaccount extends JViewLegacy
 			}
 		}
 
-		// [3488] Load the needed uikit components in this view.
+		// [3489] Load the needed uikit components in this view.
 		if ($uikit != 2 && isset($uikitComp) && CostbenefitprojectionHelper::checkArray($uikitComp))
 		{
-			// [3491] load just in case.
+			// [3492] load just in case.
 			jimport('joomla.filesystem.file');
-			// [3493] loading...
+			// [3494] loading...
 			foreach ($uikitComp as $class)
 			{
 				foreach (CostbenefitprojectionHelper::$uk_components[$class] as $name)
 				{
-					// [3498] check if the CSS file exists.
+					// [3499] check if the CSS file exists.
 					if (JFile::exists(JPATH_ROOT.'/media/com_costbenefitprojection/uikit/css/components/'.$name.$style.$size.'.css'))
 					{
-						// [3501] load the css.
+						// [3502] load the css.
 						$this->document->addStyleSheet(JURI::root(true) .'/media/com_costbenefitprojection/uikit/css/components/'.$name.$style.$size.'.css');
 					}
-					// [3504] check if the JavaScript file exists.
+					// [3505] check if the JavaScript file exists.
 					if (JFile::exists(JPATH_ROOT.'/media/com_costbenefitprojection/uikit/js/components/'.$name.$size.'.js'))
 					{
-						// [3507] load the js.
+						// [3508] load the js.
 						$this->document->addScript(JURI::root(true) .'/media/com_costbenefitprojection/uikit/js/components/'.$name.$size.'.js');
 					}
 				}
diff --git a/site/views/intervention/submitbutton.js b/site/views/intervention/submitbutton.js
index 873b8dea..45154c75 100644
--- a/site/views/intervention/submitbutton.js
+++ b/site/views/intervention/submitbutton.js
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/views/intervention/tmpl/edit.php b/site/views/intervention/tmpl/edit.php
index 04f79faf..bd21df1a 100644
--- a/site/views/intervention/tmpl/edit.php
+++ b/site/views/intervention/tmpl/edit.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -103,33 +103,33 @@ $componentParams = JComponentHelper::getParams('com_costbenefitprojection');
 
 <script type="text/javascript">
 
-// #jform_type listeners for type_ugSWqSH function
+// #jform_type listeners for type_WkmQDwg function
 jQuery('#jform_type').on('keyup',function()
 {
-	var type_ugSWqSH = jQuery("#jform_type input[type='radio']:checked").val();
-	ugSWqSH(type_ugSWqSH);
+	var type_WkmQDwg = jQuery("#jform_type input[type='radio']:checked").val();
+	WkmQDwg(type_WkmQDwg);
 
 });
 jQuery('#adminForm').on('change', '#jform_type',function (e)
 {
 	e.preventDefault();
-	var type_ugSWqSH = jQuery("#jform_type input[type='radio']:checked").val();
-	ugSWqSH(type_ugSWqSH);
+	var type_WkmQDwg = jQuery("#jform_type input[type='radio']:checked").val();
+	WkmQDwg(type_WkmQDwg);
 
 });
 
-// #jform_type listeners for type_bnFuIkh function
+// #jform_type listeners for type_rAiqAEp function
 jQuery('#jform_type').on('keyup',function()
 {
-	var type_bnFuIkh = jQuery("#jform_type input[type='radio']:checked").val();
-	bnFuIkh(type_bnFuIkh);
+	var type_rAiqAEp = jQuery("#jform_type input[type='radio']:checked").val();
+	rAiqAEp(type_rAiqAEp);
 
 });
 jQuery('#adminForm').on('change', '#jform_type',function (e)
 {
 	e.preventDefault();
-	var type_bnFuIkh = jQuery("#jform_type input[type='radio']:checked").val();
-	bnFuIkh(type_bnFuIkh);
+	var type_rAiqAEp = jQuery("#jform_type input[type='radio']:checked").val();
+	rAiqAEp(type_rAiqAEp);
 
 });
 
diff --git a/site/views/intervention/view.html.php b/site/views/intervention/view.html.php
index 20c0f137..ab70060f 100644
--- a/site/views/intervention/view.html.php
+++ b/site/views/intervention/view.html.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -88,27 +88,27 @@ class CostbenefitprojectionViewIntervention extends JViewLegacy
 		$isNew = $this->item->id == 0;
 
 		JToolbarHelper::title( JText::_($isNew ? 'COM_COSTBENEFITPROJECTION_INTERVENTION_NEW' : 'COM_COSTBENEFITPROJECTION_INTERVENTION_EDIT'), 'pencil-2 article-add');
-		// [10277] Built the actions for new and existing records.
+		// [10278] Built the actions for new and existing records.
 		if ($this->refid || $this->ref)
 		{
 			if ($this->canDo->get('intervention.create') && $isNew)
 			{
-				// [10289] We can create the record.
+				// [10290] We can create the record.
 				JToolBarHelper::save('intervention.save', 'JTOOLBAR_SAVE');
 			}
 			elseif ($this->canDo->get('intervention.edit'))
 			{
-				// [10301] We can save the record.
+				// [10302] We can save the record.
 				JToolBarHelper::save('intervention.save', 'JTOOLBAR_SAVE');
 			}
 			if ($isNew)
 			{
-				// [10306] Do not creat but cancel.
+				// [10307] Do not creat but cancel.
 				JToolBarHelper::cancel('intervention.cancel', 'JTOOLBAR_CANCEL');
 			}
 			else
 			{
-				// [10311] We can close it.
+				// [10312] We can close it.
 				JToolBarHelper::cancel('intervention.cancel', 'JTOOLBAR_CLOSE');
 			}
 		}
@@ -116,7 +116,7 @@ class CostbenefitprojectionViewIntervention extends JViewLegacy
 		{
 			if ($isNew)
 			{
-				// [10319] For new records, check the create permission.
+				// [10320] For new records, check the create permission.
 				if ($this->canDo->get('intervention.create'))
 				{
 					JToolBarHelper::apply('intervention.apply', 'JTOOLBAR_APPLY');
@@ -129,11 +129,11 @@ class CostbenefitprojectionViewIntervention extends JViewLegacy
 			{
 				if ($this->canDo->get('intervention.edit'))
 				{
-					// [10346] We can save the new record
+					// [10347] We can save the new record
 					JToolBarHelper::apply('intervention.apply', 'JTOOLBAR_APPLY');
 					JToolBarHelper::save('intervention.save', 'JTOOLBAR_SAVE');
-					// [10349] We can save this record, but check the create permission to see
-					// [10350] if we can return to make a new one.
+					// [10350] We can save this record, but check the create permission to see
+					// [10351] if we can return to make a new one.
 					if ($this->canDo->get('intervention.create'))
 					{
 						JToolBarHelper::custom('intervention.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
@@ -152,7 +152,7 @@ class CostbenefitprojectionViewIntervention extends JViewLegacy
 			}
 		}
 		JToolbarHelper::divider();
-		// [10386] set help url for this view if found
+		// [10387] set help url for this view if found
 		$help_url = CostbenefitprojectionHelper::getHelpUrl('intervention');
 		if (CostbenefitprojectionHelper::checkString($help_url))
 		{
@@ -195,7 +195,7 @@ class CostbenefitprojectionViewIntervention extends JViewLegacy
 		$document->addScript(JURI::root()."administrator/templates/isis/js/template.js");
 		// the default style of this view
 		$document->addStyleSheet(JURI::root()."components/com_costbenefitprojection/assets/css/intervention.css");
-		// [8807] Add Ajax Token
+		// [8808] Add Ajax Token
 		$document->addScriptDeclaration("var token = '".JSession::getFormToken()."';"); 
 		// default javascript of this view
 		$document->addScript(JURI::root().$this->script);
diff --git a/site/views/scaling_factor/submitbutton.js b/site/views/scaling_factor/submitbutton.js
index 88e146f1..45377919 100644
--- a/site/views/scaling_factor/submitbutton.js
+++ b/site/views/scaling_factor/submitbutton.js
@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/views/scaling_factor/tmpl/edit.php b/site/views/scaling_factor/tmpl/edit.php
index fa77dd0c..89d5d3dd 100644
--- a/site/views/scaling_factor/tmpl/edit.php
+++ b/site/views/scaling_factor/tmpl/edit.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
diff --git a/site/views/scaling_factor/view.html.php b/site/views/scaling_factor/view.html.php
index 4db15d1b..95d39167 100644
--- a/site/views/scaling_factor/view.html.php
+++ b/site/views/scaling_factor/view.html.php
@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.0.8
+	@version		3.0.9
 	@build			2nd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -88,27 +88,27 @@ class CostbenefitprojectionViewScaling_factor extends JViewLegacy
 		$isNew = $this->item->id == 0;
 
 		JToolbarHelper::title( JText::_($isNew ? 'COM_COSTBENEFITPROJECTION_SCALING_FACTOR_NEW' : 'COM_COSTBENEFITPROJECTION_SCALING_FACTOR_EDIT'), 'pencil-2 article-add');
-		// [10277] Built the actions for new and existing records.
+		// [10278] Built the actions for new and existing records.
 		if ($this->refid || $this->ref)
 		{
 			if ($this->canDo->get('scaling_factor.create') && $isNew)
 			{
-				// [10289] We can create the record.
+				// [10290] We can create the record.
 				JToolBarHelper::save('scaling_factor.save', 'JTOOLBAR_SAVE');
 			}
 			elseif ($this->canDo->get('scaling_factor.edit'))
 			{
-				// [10301] We can save the record.
+				// [10302] We can save the record.
 				JToolBarHelper::save('scaling_factor.save', 'JTOOLBAR_SAVE');
 			}
 			if ($isNew)
 			{
-				// [10306] Do not creat but cancel.
+				// [10307] Do not creat but cancel.
 				JToolBarHelper::cancel('scaling_factor.cancel', 'JTOOLBAR_CANCEL');
 			}
 			else
 			{
-				// [10311] We can close it.
+				// [10312] We can close it.
 				JToolBarHelper::cancel('scaling_factor.cancel', 'JTOOLBAR_CLOSE');
 			}
 		}
@@ -116,7 +116,7 @@ class CostbenefitprojectionViewScaling_factor extends JViewLegacy
 		{
 			if ($isNew)
 			{
-				// [10319] For new records, check the create permission.
+				// [10320] For new records, check the create permission.
 				if ($this->canDo->get('scaling_factor.create'))
 				{
 					JToolBarHelper::apply('scaling_factor.apply', 'JTOOLBAR_APPLY');
@@ -129,11 +129,11 @@ class CostbenefitprojectionViewScaling_factor extends JViewLegacy
 			{
 				if ($this->canDo->get('scaling_factor.edit'))
 				{
-					// [10346] We can save the new record
+					// [10347] We can save the new record
 					JToolBarHelper::apply('scaling_factor.apply', 'JTOOLBAR_APPLY');
 					JToolBarHelper::save('scaling_factor.save', 'JTOOLBAR_SAVE');
-					// [10349] We can save this record, but check the create permission to see
-					// [10350] if we can return to make a new one.
+					// [10350] We can save this record, but check the create permission to see
+					// [10351] if we can return to make a new one.
 					if ($this->canDo->get('scaling_factor.create'))
 					{
 						JToolBarHelper::custom('scaling_factor.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
@@ -152,7 +152,7 @@ class CostbenefitprojectionViewScaling_factor extends JViewLegacy
 			}
 		}
 		JToolbarHelper::divider();
-		// [10386] set help url for this view if found
+		// [10387] set help url for this view if found
 		$help_url = CostbenefitprojectionHelper::getHelpUrl('scaling_factor');
 		if (CostbenefitprojectionHelper::checkString($help_url))
 		{