From 8c18416d34bd9a4f2371d950f4ae1abc1cd6fc1d Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe <llewellyn@vdm.io>
Date: Wed, 23 Dec 2015 22:51:24 +0200
Subject: [PATCH] Added to update server, all 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       |  94 ++--
 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              | 166 +++---
 admin/models/companies.php                    | 124 ++---
 admin/models/company.php                      | 354 ++++++------
 admin/models/companyresults.php               | 164 +++---
 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                     |   7 +-
 script.php                                    | 508 +++++++++---------
 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/publicresults.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        |  58 +-
 site/helpers/headercheck.php                  |   2 +-
 site/helpers/route.php                        |  42 +-
 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               | 166 +++---
 site/models/company.php                       | 354 ++++++------
 site/models/companyresults.php                | 164 +++---
 site/models/cpanel.php                        |  98 ++--
 site/models/createaccount.php                 |  38 +-
 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/publicresults.php                 |  96 ++--
 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               |  64 +--
 site/views/createaccount/tmpl/default.php     |   2 +-
 site/views/createaccount/view.html.php        |  46 +-
 site/views/intervention/submitbutton.js       |   2 +-
 site/views/intervention/tmpl/edit.php         |  22 +-
 site/views/intervention/view.html.php         |  24 +-
 site/views/publicresults/tmpl/default.php     |   2 +-
 .../publicresults/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/publicresults/view.html.php        |  52 +-
 site/views/scaling_factor/submitbutton.js     |   2 +-
 site/views/scaling_factor/tmpl/edit.php       |   2 +-
 site/views/scaling_factor/view.html.php       |  22 +-
 423 files changed, 4155 insertions(+), 4152 deletions(-)

diff --git a/README.md b/README.md
index 39e156b5..c8f6b8e0 100644
--- a/README.md
+++ b/README.md
@@ -22,12 +22,12 @@ max_input_vars = 5000
 + *Author*: [Llewellyn van der Merwe] (mailto:llewellyn@vdm.io)
 + *Name*: [Cost Benefit Projection] (https://www.staffhealthcbp.com/)
 + *First Build*: 15th June, 2012
-+ *Last Build*: 17th December, 2015
++ *Last Build*: 23rd December, 2015
 + *Version*: 3.1.0
 + *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*: **80168**
-+ *File count*: **544**
++ *Line count*: **80206**
++ *File count*: **545**
 + *Folder count*: **101**
 
 > This **component** was build with a Joomla [Automated Component Builder] (https://www.vdm.io/joomla-component-builder).
diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css
index 166b4275..aef1f468 100644
--- a/admin/assets/css/admin.css
+++ b/admin/assets/css/admin.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		admin.css
diff --git a/admin/assets/css/causerisk.css b/admin/assets/css/causerisk.css
index f0569a1b..86595f41 100644
--- a/admin/assets/css/causerisk.css
+++ b/admin/assets/css/causerisk.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		causerisk.css
diff --git a/admin/assets/css/causesrisks.css b/admin/assets/css/causesrisks.css
index 3670eee4..373b95ba 100644
--- a/admin/assets/css/causesrisks.css
+++ b/admin/assets/css/causesrisks.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		causesrisks.css
diff --git a/admin/assets/css/combinedresults.css b/admin/assets/css/combinedresults.css
index 8fbc7066..94249881 100644
--- a/admin/assets/css/combinedresults.css
+++ b/admin/assets/css/combinedresults.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		combinedresults.css
diff --git a/admin/assets/css/companies.css b/admin/assets/css/companies.css
index 2c4b04d7..b55b5e56 100644
--- a/admin/assets/css/companies.css
+++ b/admin/assets/css/companies.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		companies.css
diff --git a/admin/assets/css/company.css b/admin/assets/css/company.css
index ddd8eb43..a5695e6e 100644
--- a/admin/assets/css/company.css
+++ b/admin/assets/css/company.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		company.css
diff --git a/admin/assets/css/companyresults.css b/admin/assets/css/companyresults.css
index a6e25a76..a87f51be 100644
--- a/admin/assets/css/companyresults.css
+++ b/admin/assets/css/companyresults.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		companyresults.css
diff --git a/admin/assets/css/countries.css b/admin/assets/css/countries.css
index 9af905d5..00faa416 100644
--- a/admin/assets/css/countries.css
+++ b/admin/assets/css/countries.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		countries.css
diff --git a/admin/assets/css/country.css b/admin/assets/css/country.css
index dba633dd..1193e059 100644
--- a/admin/assets/css/country.css
+++ b/admin/assets/css/country.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		country.css
diff --git a/admin/assets/css/currencies.css b/admin/assets/css/currencies.css
index bd5ac026..6eaa27d6 100644
--- a/admin/assets/css/currencies.css
+++ b/admin/assets/css/currencies.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		currencies.css
diff --git a/admin/assets/css/currency.css b/admin/assets/css/currency.css
index 979a3062..2b6fe3d8 100644
--- a/admin/assets/css/currency.css
+++ b/admin/assets/css/currency.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		currency.css
diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css
index 9e77a957..61b1170b 100644
--- a/admin/assets/css/dashboard.css
+++ b/admin/assets/css/dashboard.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		dashboard.css
diff --git a/admin/assets/css/health_data.css b/admin/assets/css/health_data.css
index 7d8a79ee..736f76fd 100644
--- a/admin/assets/css/health_data.css
+++ b/admin/assets/css/health_data.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		health_data.css
diff --git a/admin/assets/css/health_data_sets.css b/admin/assets/css/health_data_sets.css
index 8faebf4d..c558b2d1 100644
--- a/admin/assets/css/health_data_sets.css
+++ b/admin/assets/css/health_data_sets.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		health_data_sets.css
diff --git a/admin/assets/css/help_document.css b/admin/assets/css/help_document.css
index 38b99ec3..dd4f7ad7 100644
--- a/admin/assets/css/help_document.css
+++ b/admin/assets/css/help_document.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		help_document.css
diff --git a/admin/assets/css/help_documents.css b/admin/assets/css/help_documents.css
index 1212eda8..0b50ae3d 100644
--- a/admin/assets/css/help_documents.css
+++ b/admin/assets/css/help_documents.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		help_documents.css
diff --git a/admin/assets/css/intervention.css b/admin/assets/css/intervention.css
index 551cb896..9f7e1964 100644
--- a/admin/assets/css/intervention.css
+++ b/admin/assets/css/intervention.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		intervention.css
diff --git a/admin/assets/css/interventions.css b/admin/assets/css/interventions.css
index c23603d1..aca5b43a 100644
--- a/admin/assets/css/interventions.css
+++ b/admin/assets/css/interventions.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		interventions.css
diff --git a/admin/assets/css/scaling_factor.css b/admin/assets/css/scaling_factor.css
index 6f70dd8e..51d333cb 100644
--- a/admin/assets/css/scaling_factor.css
+++ b/admin/assets/css/scaling_factor.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		scaling_factor.css
diff --git a/admin/assets/css/scaling_factors.css b/admin/assets/css/scaling_factors.css
index 11eccfbf..ae437405 100644
--- a/admin/assets/css/scaling_factors.css
+++ b/admin/assets/css/scaling_factors.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		scaling_factors.css
diff --git a/admin/assets/css/service_provider.css b/admin/assets/css/service_provider.css
index 5a470f32..7eea6ffd 100644
--- a/admin/assets/css/service_provider.css
+++ b/admin/assets/css/service_provider.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		service_provider.css
diff --git a/admin/assets/css/service_providers.css b/admin/assets/css/service_providers.css
index 6a48759c..0ccc136f 100644
--- a/admin/assets/css/service_providers.css
+++ b/admin/assets/css/service_providers.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		service_providers.css
diff --git a/admin/config.xml b/admin/config.xml
index 74bd800e..a0dd5422 100644
--- a/admin/config.xml
+++ b/admin/config.xml
@@ -355,7 +355,7 @@
 			multiple="true"
 		/>
 
-		<!-- [11451] Memberbasicgroup Field. Type: Usergroup. (joomla) -->
+		<!-- [11622] Memberbasicgroup Field. Type: Usergroup. (joomla) -->
 		<field
 			type="usergroup"
 			name="memberbasicgroup"
@@ -363,7 +363,7 @@
 			description="COM_COSTBENEFITPROJECTION_CONFIG_MEMBERBASICGROUP_DESCRIPTION"
 			multiple="true"
 		/>		
-		<!-- [11451] Advancedmembergroup Field. Type: Usergroup. (joomla) -->
+		<!-- [11622] 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="">
-			<!-- [13324] Option Set. -->
+			<!-- [13495] 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="">
-			<!-- [13349] Option Set. -->
+			<!-- [13520] 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="">
-			<!-- [13370] Option Set. -->
+			<!-- [13541] 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"  />
-		<!-- [13402] Admin_chartbackground Field. Type: Color. -->
+		<!-- [13573] 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"
 		/>		
-		<!-- [13410] Admin_mainwidth Field. Type: Text. -->
+		<!-- [13581] 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"
 		/>		
-		<!-- [13423] Spacer_chartadmin_hr_a Field. Type: Spacer. A None Database Field. -->
+		<!-- [13594] 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" />		
-		<!-- [13425] Admin_chartareatop Field. Type: Text. -->
+		<!-- [13596] 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"
 		/>		
-		<!-- [13438] Admin_chartarealeft Field. Type: Text. -->
+		<!-- [13609] 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"
 		/>		
-		<!-- [13451] Admin_chartareawidth Field. Type: Text. -->
+		<!-- [13622] 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"
 		/>		
-		<!-- [13464] Spacer_chartadmin_hr_b Field. Type: Spacer. A None Database Field. -->
+		<!-- [13635] 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" />		
-		<!-- [13466] Admin_legendtextstylefontcolor Field. Type: Color. -->
+		<!-- [13637] 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"
 		/>		
-		<!-- [13474] Admin_legendtextstylefontsize Field. Type: Text. -->
+		<!-- [13645] 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"
 		/>		
-		<!-- [13487] Spacer_chartadmin_hr_c Field. Type: Spacer. A None Database Field. -->
+		<!-- [13658] 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" />		
-		<!-- [13489] Admin_vaxistextstylefontcolor Field. Type: Color. -->
+		<!-- [13660] 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"
 		/>		
-		<!-- [13497] Spacer_chartadmin_hr_d Field. Type: Spacer. A None Database Field. -->
+		<!-- [13668] 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" />		
-		<!-- [13499] Admin_haxistextstylefontcolor Field. Type: Color. -->
+		<!-- [13670] 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"
 		/>		
-		<!-- [13507] Admin_haxistitletextstylefontcolor Field. Type: Color. -->
+		<!-- [13678] 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"  />
 		
-		<!-- [13518] Site_chartbackground Field. Type: Color. -->
+		<!-- [13689] 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"
 		/>		
-		<!-- [13526] Site_mainwidth Field. Type: Text. -->
+		<!-- [13697] 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"
 		/>		
-		<!-- [13539] Spacer_chartsite_hr_a Field. Type: Spacer. A None Database Field. -->
+		<!-- [13710] 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" />		
-		<!-- [13541] Site_chartareatop Field. Type: Text. -->
+		<!-- [13712] 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"
 		/>		
-		<!-- [13554] Site_chartarealeft Field. Type: Text. -->
+		<!-- [13725] 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"
 		/>		
-		<!-- [13567] Site_chartareawidth Field. Type: Text. -->
+		<!-- [13738] 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"
 		/>		
-		<!-- [13580] Spacer_chartsite_hr_b Field. Type: Spacer. A None Database Field. -->
+		<!-- [13751] 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" />		
-		<!-- [13582] Site_legendtextstylefontcolor Field. Type: Color. -->
+		<!-- [13753] 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"
 		/>		
-		<!-- [13590] Site_legendtextstylefontsize Field. Type: Text. -->
+		<!-- [13761] 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"
 		/>		
-		<!-- [13603] Spacer_chartsite_hr_c Field. Type: Spacer. A None Database Field. -->
+		<!-- [13774] 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" />		
-		<!-- [13605] Site_vaxistextstylefontcolor Field. Type: Color. -->
+		<!-- [13776] 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"
 		/>		
-		<!-- [13613] Spacer_chartsite_hr_d Field. Type: Spacer. A None Database Field. -->
+		<!-- [13784] 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" />		
-		<!-- [13615] Site_haxistextstylefontcolor Field. Type: Color. -->
+		<!-- [13786] 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"
 		/>		
-		<!-- [13623] Site_haxistitletextstylefontcolor Field. Type: Color. -->
+		<!-- [13794] Site_haxistitletextstylefontcolor Field. Type: Color. -->
 		<field
 			type="color"
 			name="site_haxistitletextstylefontcolor"
@@ -669,7 +669,7 @@
 			default=""
 		/>
 
-		<!-- [11451] Resultpath Field. Type: Text. (joomla) -->
+		<!-- [11622] Resultpath Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="resultpath"
diff --git a/admin/controller.php b/admin/controller.php
index 502d9631..bda2d00d 100644
--- a/admin/controller.php
+++ b/admin/controller.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		controller.php
diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php
index 47232e00..e81182ee 100644
--- a/admin/controllers/ajax.json.php
+++ b/admin/controllers/ajax.json.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		ajax.json.php
diff --git a/admin/controllers/causerisk.php b/admin/controllers/causerisk.php
index 292c2e75..5e9874d4 100644
--- a/admin/controllers/causerisk.php
+++ b/admin/controllers/causerisk.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		causerisk.php
@@ -54,13 +54,13 @@ class CostbenefitprojectionControllerCauserisk extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
-		// [9404] Access check.
+		// [9571] Access check.
 		$access = JFactory::getUser()->authorise('causerisk.access', 'com_costbenefitprojection');
 		if (!$access)
 		{
 			return false;
 		}
-		// [9415] In the absense of better information, revert to the component permissions.
+		// [9582] 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')
 	{
-		// [9558] get user object.
+		// [9725] get user object.
 		$user		= JFactory::getUser();
-		// [9560] get record id.
+		// [9727] get record id.
 		$recordId	= (int) isset($data[$key]) ? $data[$key] : 0;
 
 
-		// [9567] Access check.
+		// [9734] 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)
 		{
-			// [9576] The record has been set. Check the record permissions.
+			// [9743] 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))
 				{
-					// [9598] Now test the owner is the user.
+					// [9765] Now test the owner is the user.
 					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
 					if (empty($ownerId))
 					{
-						// [9602] Need to do a lookup from the model.
+						// [9769] 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;
 					}
 
-					// [9610] If the owner matches 'me' then allow.
+					// [9777] 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;
 			}
 		}
-		// [9632] Since there is no permission, revert to the component permissions.
+		// [9799] 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 d29f4c06..4094ad36 100644
--- a/admin/controllers/causesrisks.php
+++ b/admin/controllers/causesrisks.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		causesrisks.php
@@ -42,29 +42,29 @@ class CostbenefitprojectionControllerCausesrisks extends JControllerAdmin
 
 	public function exportData()
 	{
-		// [7354] Check for request forgeries
+		// [7521] Check for request forgeries
 		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
-		// [7356] check if export is allowed for this user.
+		// [7523] check if export is allowed for this user.
 		$user = JFactory::getUser();
 		if ($user->authorise('causerisk.export', 'com_costbenefitprojection') && $user->authorise('core.export', 'com_costbenefitprojection'))
 		{
-			// [7360] Get the input
+			// [7527] Get the input
 			$input = JFactory::getApplication()->input;
 			$pks = $input->post->get('cid', array(), 'array');
-			// [7363] Sanitize the input
+			// [7530] Sanitize the input
 			JArrayHelper::toInteger($pks);
-			// [7365] Get the model
+			// [7532] Get the model
 			$model = $this->getModel('Causesrisks');
-			// [7367] get the data to export
+			// [7534] get the data to export
 			$data = $model->getExportData($pks);
 			if (CostbenefitprojectionHelper::checkArray($data))
 			{
-				// [7371] now set the data to the spreadsheet
+				// [7538] 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');
 			}
 		}
-		// [7376] Redirect to the list screen with error.
+		// [7543] 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()
 	{
-		// [7385] Check for request forgeries
+		// [7552] Check for request forgeries
 		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
-		// [7387] check if import is allowed for this user.
+		// [7554] check if import is allowed for this user.
 		$user = JFactory::getUser();
 		if ($user->authorise('causerisk.import', 'com_costbenefitprojection') && $user->authorise('core.import', 'com_costbenefitprojection'))
 		{
-			// [7391] Get the import model
+			// [7558] Get the import model
 			$model = $this->getModel('Causesrisks');
-			// [7393] get the headers to import
+			// [7560] get the headers to import
 			$headers = $model->getExImPortHeaders();
 			if (CostbenefitprojectionHelper::checkObject($headers))
 			{
-				// [7397] Load headers to session.
+				// [7564] 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');
-				// [7403] Redirect to import view.
+				// [7570] 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;
 			}
 		}
-		// [7415] Redirect to the list screen with error.
+		// [7582] 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 170b6dee..1646987f 100644
--- a/admin/controllers/combinedresults.php
+++ b/admin/controllers/combinedresults.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		combinedresults.php
diff --git a/admin/controllers/companies.php b/admin/controllers/companies.php
index 53675484..cd49546a 100644
--- a/admin/controllers/companies.php
+++ b/admin/controllers/companies.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		companies.php
@@ -42,29 +42,29 @@ class CostbenefitprojectionControllerCompanies extends JControllerAdmin
 
 	public function exportData()
 	{
-		// [7354] Check for request forgeries
+		// [7521] Check for request forgeries
 		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
-		// [7356] check if export is allowed for this user.
+		// [7523] check if export is allowed for this user.
 		$user = JFactory::getUser();
 		if ($user->authorise('company.export', 'com_costbenefitprojection') && $user->authorise('core.export', 'com_costbenefitprojection'))
 		{
-			// [7360] Get the input
+			// [7527] Get the input
 			$input = JFactory::getApplication()->input;
 			$pks = $input->post->get('cid', array(), 'array');
-			// [7363] Sanitize the input
+			// [7530] Sanitize the input
 			JArrayHelper::toInteger($pks);
-			// [7365] Get the model
+			// [7532] Get the model
 			$model = $this->getModel('Companies');
-			// [7367] get the data to export
+			// [7534] get the data to export
 			$data = $model->getExportData($pks);
 			if (CostbenefitprojectionHelper::checkArray($data))
 			{
-				// [7371] now set the data to the spreadsheet
+				// [7538] 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');
 			}
 		}
-		// [7376] Redirect to the list screen with error.
+		// [7543] 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()
 	{
-		// [7385] Check for request forgeries
+		// [7552] Check for request forgeries
 		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
-		// [7387] check if import is allowed for this user.
+		// [7554] check if import is allowed for this user.
 		$user = JFactory::getUser();
 		if ($user->authorise('company.import', 'com_costbenefitprojection') && $user->authorise('core.import', 'com_costbenefitprojection'))
 		{
-			// [7391] Get the import model
+			// [7558] Get the import model
 			$model = $this->getModel('Companies');
-			// [7393] get the headers to import
+			// [7560] get the headers to import
 			$headers = $model->getExImPortHeaders();
 			if (CostbenefitprojectionHelper::checkObject($headers))
 			{
-				// [7397] Load headers to session.
+				// [7564] 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');
-				// [7403] Redirect to import view.
+				// [7570] 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;
 			}
 		}
-		// [7415] Redirect to the list screen with error.
+		// [7582] 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()
 	{
-		// [7226] Check for request forgeries
+		// [7393] Check for request forgeries
 		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
-		// [7228] check if export is allowed for this user.
+		// [7395] check if export is allowed for this user.
 		$user = JFactory::getUser();
 		if ($user->authorise('combinedresults.access', 'com_costbenefitprojection'))
 		{
-			// [7232] Get the input
+			// [7399] Get the input
 			$input = JFactory::getApplication()->input;
 			$pks = $input->post->get('cid', array(), 'array');
-			// [7235] Sanitize the input
+			// [7402] Sanitize the input
 			JArrayHelper::toInteger($pks);
-			// [7237] convert to string
+			// [7404] convert to string
 			$ids = implode('_', $pks);
 			$this->setRedirect(JRoute::_('index.php?option=com_costbenefitprojection&view=combinedresults&cid='.$ids, false));
 			return;
 		}
-		// [7242] Redirect to the list screen with error.
+		// [7409] 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 6f2cb285..68a3ad0f 100644
--- a/admin/controllers/company.php
+++ b/admin/controllers/company.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		company.php
@@ -54,13 +54,13 @@ class CostbenefitprojectionControllerCompany extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
-		// [9404] Access check.
+		// [9571] Access check.
 		$access = JFactory::getUser()->authorise('company.access', 'com_costbenefitprojection');
 		if (!$access)
 		{
 			return false;
 		}
-		// [9415] In the absense of better information, revert to the component permissions.
+		// [9582] 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')
 	{
-		// [9558] get user object.
+		// [9725] get user object.
 		$user		= JFactory::getUser();
-		// [9560] get record id.
+		// [9727] 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;
 		}
 
-		// [9567] Access check.
+		// [9734] 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)
 		{
-			// [9576] The record has been set. Check the record permissions.
+			// [9743] 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))
 				{
-					// [9598] Now test the owner is the user.
+					// [9765] Now test the owner is the user.
 					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
 					if (empty($ownerId))
 					{
-						// [9602] Need to do a lookup from the model.
+						// [9769] 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;
 					}
 
-					// [9610] If the owner matches 'me' then allow.
+					// [9777] 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;
 			}
 		}
-		// [9632] Since there is no permission, revert to the component permissions.
+		// [9799] 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 41d69468..91582974 100644
--- a/admin/controllers/companyresults.php
+++ b/admin/controllers/companyresults.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		companyresults.php
diff --git a/admin/controllers/costbenefitprojection.php b/admin/controllers/costbenefitprojection.php
index 1a52b72d..35ebbee9 100644
--- a/admin/controllers/costbenefitprojection.php
+++ b/admin/controllers/costbenefitprojection.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		costbenefitprojection.php
diff --git a/admin/controllers/countries.php b/admin/controllers/countries.php
index 009fd4d3..caf0681f 100644
--- a/admin/controllers/countries.php
+++ b/admin/controllers/countries.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		countries.php
@@ -42,29 +42,29 @@ class CostbenefitprojectionControllerCountries extends JControllerAdmin
 
 	public function exportData()
 	{
-		// [7354] Check for request forgeries
+		// [7521] Check for request forgeries
 		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
-		// [7356] check if export is allowed for this user.
+		// [7523] check if export is allowed for this user.
 		$user = JFactory::getUser();
 		if ($user->authorise('country.export', 'com_costbenefitprojection') && $user->authorise('core.export', 'com_costbenefitprojection'))
 		{
-			// [7360] Get the input
+			// [7527] Get the input
 			$input = JFactory::getApplication()->input;
 			$pks = $input->post->get('cid', array(), 'array');
-			// [7363] Sanitize the input
+			// [7530] Sanitize the input
 			JArrayHelper::toInteger($pks);
-			// [7365] Get the model
+			// [7532] Get the model
 			$model = $this->getModel('Countries');
-			// [7367] get the data to export
+			// [7534] get the data to export
 			$data = $model->getExportData($pks);
 			if (CostbenefitprojectionHelper::checkArray($data))
 			{
-				// [7371] now set the data to the spreadsheet
+				// [7538] 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');
 			}
 		}
-		// [7376] Redirect to the list screen with error.
+		// [7543] 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()
 	{
-		// [7385] Check for request forgeries
+		// [7552] Check for request forgeries
 		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
-		// [7387] check if import is allowed for this user.
+		// [7554] check if import is allowed for this user.
 		$user = JFactory::getUser();
 		if ($user->authorise('country.import', 'com_costbenefitprojection') && $user->authorise('core.import', 'com_costbenefitprojection'))
 		{
-			// [7391] Get the import model
+			// [7558] Get the import model
 			$model = $this->getModel('Countries');
-			// [7393] get the headers to import
+			// [7560] get the headers to import
 			$headers = $model->getExImPortHeaders();
 			if (CostbenefitprojectionHelper::checkObject($headers))
 			{
-				// [7397] Load headers to session.
+				// [7564] 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');
-				// [7403] Redirect to import view.
+				// [7570] 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;
 			}
 		}
-		// [7415] Redirect to the list screen with error.
+		// [7582] 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 0ea2cf8e..3aae6499 100644
--- a/admin/controllers/country.php
+++ b/admin/controllers/country.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		country.php
@@ -54,13 +54,13 @@ class CostbenefitprojectionControllerCountry extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
-		// [9404] Access check.
+		// [9571] Access check.
 		$access = JFactory::getUser()->authorise('country.access', 'com_costbenefitprojection');
 		if (!$access)
 		{
 			return false;
 		}
-		// [9415] In the absense of better information, revert to the component permissions.
+		// [9582] 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')
 	{
-		// [9558] get user object.
+		// [9725] get user object.
 		$user		= JFactory::getUser();
-		// [9560] get record id.
+		// [9727] 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
 			}
 		}
 
-		// [9567] Access check.
+		// [9734] 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)
 		{
-			// [9576] The record has been set. Check the record permissions.
+			// [9743] 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))
 				{
-					// [9598] Now test the owner is the user.
+					// [9765] Now test the owner is the user.
 					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
 					if (empty($ownerId))
 					{
-						// [9602] Need to do a lookup from the model.
+						// [9769] 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;
 					}
 
-					// [9610] If the owner matches 'me' then allow.
+					// [9777] 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;
 			}
 		}
-		// [9632] Since there is no permission, revert to the component permissions.
+		// [9799] 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 e3aa753c..4048ddef 100644
--- a/admin/controllers/currencies.php
+++ b/admin/controllers/currencies.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		currencies.php
@@ -42,29 +42,29 @@ class CostbenefitprojectionControllerCurrencies extends JControllerAdmin
 
 	public function exportData()
 	{
-		// [7354] Check for request forgeries
+		// [7521] Check for request forgeries
 		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
-		// [7356] check if export is allowed for this user.
+		// [7523] check if export is allowed for this user.
 		$user = JFactory::getUser();
 		if ($user->authorise('currency.export', 'com_costbenefitprojection') && $user->authorise('core.export', 'com_costbenefitprojection'))
 		{
-			// [7360] Get the input
+			// [7527] Get the input
 			$input = JFactory::getApplication()->input;
 			$pks = $input->post->get('cid', array(), 'array');
-			// [7363] Sanitize the input
+			// [7530] Sanitize the input
 			JArrayHelper::toInteger($pks);
-			// [7365] Get the model
+			// [7532] Get the model
 			$model = $this->getModel('Currencies');
-			// [7367] get the data to export
+			// [7534] get the data to export
 			$data = $model->getExportData($pks);
 			if (CostbenefitprojectionHelper::checkArray($data))
 			{
-				// [7371] now set the data to the spreadsheet
+				// [7538] 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');
 			}
 		}
-		// [7376] Redirect to the list screen with error.
+		// [7543] 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()
 	{
-		// [7385] Check for request forgeries
+		// [7552] Check for request forgeries
 		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
-		// [7387] check if import is allowed for this user.
+		// [7554] check if import is allowed for this user.
 		$user = JFactory::getUser();
 		if ($user->authorise('currency.import', 'com_costbenefitprojection') && $user->authorise('core.import', 'com_costbenefitprojection'))
 		{
-			// [7391] Get the import model
+			// [7558] Get the import model
 			$model = $this->getModel('Currencies');
-			// [7393] get the headers to import
+			// [7560] get the headers to import
 			$headers = $model->getExImPortHeaders();
 			if (CostbenefitprojectionHelper::checkObject($headers))
 			{
-				// [7397] Load headers to session.
+				// [7564] 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');
-				// [7403] Redirect to import view.
+				// [7570] 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;
 			}
 		}
-		// [7415] Redirect to the list screen with error.
+		// [7582] 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 40dea225..9eab6990 100644
--- a/admin/controllers/currency.php
+++ b/admin/controllers/currency.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		currency.php
@@ -54,13 +54,13 @@ class CostbenefitprojectionControllerCurrency extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
-		// [9404] Access check.
+		// [9571] Access check.
 		$access = JFactory::getUser()->authorise('currency.access', 'com_costbenefitprojection');
 		if (!$access)
 		{
 			return false;
 		}
-		// [9415] In the absense of better information, revert to the component permissions.
+		// [9582] 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')
 	{
-		// [9558] get user object.
+		// [9725] get user object.
 		$user		= JFactory::getUser();
-		// [9560] get record id.
+		// [9727] get record id.
 		$recordId	= (int) isset($data[$key]) ? $data[$key] : 0;
 
 
-		// [9567] Access check.
+		// [9734] 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)
 		{
-			// [9576] The record has been set. Check the record permissions.
+			// [9743] 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))
 				{
-					// [9598] Now test the owner is the user.
+					// [9765] Now test the owner is the user.
 					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
 					if (empty($ownerId))
 					{
-						// [9602] Need to do a lookup from the model.
+						// [9769] 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;
 					}
 
-					// [9610] If the owner matches 'me' then allow.
+					// [9777] 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;
 			}
 		}
-		// [9632] Since there is no permission, revert to the component permissions.
+		// [9799] 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 940f0385..6dcb6caf 100644
--- a/admin/controllers/health_data.php
+++ b/admin/controllers/health_data.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		health_data.php
@@ -54,13 +54,13 @@ class CostbenefitprojectionControllerHealth_data extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
-		// [9404] Access check.
+		// [9571] Access check.
 		$access = JFactory::getUser()->authorise('health_data.access', 'com_costbenefitprojection');
 		if (!$access)
 		{
 			return false;
 		}
-		// [9415] In the absense of better information, revert to the component permissions.
+		// [9582] 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')
 	{
-		// [9558] get user object.
+		// [9725] get user object.
 		$user		= JFactory::getUser();
-		// [9560] get record id.
+		// [9727] 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
 			}
 		}
 
-		// [9567] Access check.
+		// [9734] 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)
 		{
-			// [9576] The record has been set. Check the record permissions.
+			// [9743] 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))
 				{
-					// [9598] Now test the owner is the user.
+					// [9765] Now test the owner is the user.
 					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
 					if (empty($ownerId))
 					{
-						// [9602] Need to do a lookup from the model.
+						// [9769] 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;
 					}
 
-					// [9610] If the owner matches 'me' then allow.
+					// [9777] 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;
 			}
 		}
-		// [9632] Since there is no permission, revert to the component permissions.
+		// [9799] 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 20cb9d27..9dbebf46 100644
--- a/admin/controllers/health_data_sets.php
+++ b/admin/controllers/health_data_sets.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		health_data_sets.php
@@ -42,29 +42,29 @@ class CostbenefitprojectionControllerHealth_data_sets extends JControllerAdmin
 
 	public function exportData()
 	{
-		// [7354] Check for request forgeries
+		// [7521] Check for request forgeries
 		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
-		// [7356] check if export is allowed for this user.
+		// [7523] 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'))
 		{
-			// [7360] Get the input
+			// [7527] Get the input
 			$input = JFactory::getApplication()->input;
 			$pks = $input->post->get('cid', array(), 'array');
-			// [7363] Sanitize the input
+			// [7530] Sanitize the input
 			JArrayHelper::toInteger($pks);
-			// [7365] Get the model
+			// [7532] Get the model
 			$model = $this->getModel('Health_data_sets');
-			// [7367] get the data to export
+			// [7534] get the data to export
 			$data = $model->getExportData($pks);
 			if (CostbenefitprojectionHelper::checkArray($data))
 			{
-				// [7371] now set the data to the spreadsheet
+				// [7538] 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');
 			}
 		}
-		// [7376] Redirect to the list screen with error.
+		// [7543] 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()
 	{
-		// [7385] Check for request forgeries
+		// [7552] Check for request forgeries
 		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
-		// [7387] check if import is allowed for this user.
+		// [7554] 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'))
 		{
-			// [7391] Get the import model
+			// [7558] Get the import model
 			$model = $this->getModel('Health_data_sets');
-			// [7393] get the headers to import
+			// [7560] get the headers to import
 			$headers = $model->getExImPortHeaders();
 			if (CostbenefitprojectionHelper::checkObject($headers))
 			{
-				// [7397] Load headers to session.
+				// [7564] 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');
-				// [7403] Redirect to import view.
+				// [7570] 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;
 			}
 		}
-		// [7415] Redirect to the list screen with error.
+		// [7582] 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 52257acc..e50be7e0 100644
--- a/admin/controllers/help.php
+++ b/admin/controllers/help.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		help.php
diff --git a/admin/controllers/help_document.php b/admin/controllers/help_document.php
index 073bd554..a92526a7 100644
--- a/admin/controllers/help_document.php
+++ b/admin/controllers/help_document.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		help_document.php
@@ -54,13 +54,13 @@ class CostbenefitprojectionControllerHelp_document extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
-		// [9404] Access check.
+		// [9571] Access check.
 		$access = JFactory::getUser()->authorise('help_document.access', 'com_costbenefitprojection');
 		if (!$access)
 		{
 			return false;
 		}
-		// [9415] In the absense of better information, revert to the component permissions.
+		// [9582] 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')
 	{
-		// [9558] get user object.
+		// [9725] get user object.
 		$user		= JFactory::getUser();
-		// [9560] get record id.
+		// [9727] get record id.
 		$recordId	= (int) isset($data[$key]) ? $data[$key] : 0;
 
 
-		// [9567] Access check.
+		// [9734] 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)
 		{
-			// [9576] The record has been set. Check the record permissions.
+			// [9743] 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))
 				{
-					// [9598] Now test the owner is the user.
+					// [9765] Now test the owner is the user.
 					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
 					if (empty($ownerId))
 					{
-						// [9602] Need to do a lookup from the model.
+						// [9769] 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;
 					}
 
-					// [9610] If the owner matches 'me' then allow.
+					// [9777] 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;
 			}
 		}
-		// [9632] Since there is no permission, revert to the component permissions.
+		// [9799] 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 6bd03eb8..c14d8396 100644
--- a/admin/controllers/help_documents.php
+++ b/admin/controllers/help_documents.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		help_documents.php
@@ -42,29 +42,29 @@ class CostbenefitprojectionControllerHelp_documents extends JControllerAdmin
 
 	public function exportData()
 	{
-		// [7354] Check for request forgeries
+		// [7521] Check for request forgeries
 		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
-		// [7356] check if export is allowed for this user.
+		// [7523] 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'))
 		{
-			// [7360] Get the input
+			// [7527] Get the input
 			$input = JFactory::getApplication()->input;
 			$pks = $input->post->get('cid', array(), 'array');
-			// [7363] Sanitize the input
+			// [7530] Sanitize the input
 			JArrayHelper::toInteger($pks);
-			// [7365] Get the model
+			// [7532] Get the model
 			$model = $this->getModel('Help_documents');
-			// [7367] get the data to export
+			// [7534] get the data to export
 			$data = $model->getExportData($pks);
 			if (CostbenefitprojectionHelper::checkArray($data))
 			{
-				// [7371] now set the data to the spreadsheet
+				// [7538] 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');
 			}
 		}
-		// [7376] Redirect to the list screen with error.
+		// [7543] 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()
 	{
-		// [7385] Check for request forgeries
+		// [7552] Check for request forgeries
 		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
-		// [7387] check if import is allowed for this user.
+		// [7554] 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'))
 		{
-			// [7391] Get the import model
+			// [7558] Get the import model
 			$model = $this->getModel('Help_documents');
-			// [7393] get the headers to import
+			// [7560] get the headers to import
 			$headers = $model->getExImPortHeaders();
 			if (CostbenefitprojectionHelper::checkObject($headers))
 			{
-				// [7397] Load headers to session.
+				// [7564] 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');
-				// [7403] Redirect to import view.
+				// [7570] 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;
 			}
 		}
-		// [7415] Redirect to the list screen with error.
+		// [7582] 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 ceb82a84..2290899c 100644
--- a/admin/controllers/import.php
+++ b/admin/controllers/import.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		import.php
diff --git a/admin/controllers/intervention.php b/admin/controllers/intervention.php
index e9a6e692..b6d993b6 100644
--- a/admin/controllers/intervention.php
+++ b/admin/controllers/intervention.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		intervention.php
@@ -54,13 +54,13 @@ class CostbenefitprojectionControllerIntervention extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
-		// [9404] Access check.
+		// [9571] Access check.
 		$access = JFactory::getUser()->authorise('intervention.access', 'com_costbenefitprojection');
 		if (!$access)
 		{
 			return false;
 		}
-		// [9415] In the absense of better information, revert to the component permissions.
+		// [9582] 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')
 	{
-		// [9558] get user object.
+		// [9725] get user object.
 		$user		= JFactory::getUser();
-		// [9560] get record id.
+		// [9727] 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;
 		}
 
-		// [9567] Access check.
+		// [9734] 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)
 		{
-			// [9576] The record has been set. Check the record permissions.
+			// [9743] 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))
 				{
-					// [9598] Now test the owner is the user.
+					// [9765] Now test the owner is the user.
 					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
 					if (empty($ownerId))
 					{
-						// [9602] Need to do a lookup from the model.
+						// [9769] 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;
 					}
 
-					// [9610] If the owner matches 'me' then allow.
+					// [9777] 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;
 			}
 		}
-		// [9632] Since there is no permission, revert to the component permissions.
+		// [9799] 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 562d8afd..3ccc3701 100644
--- a/admin/controllers/interventions.php
+++ b/admin/controllers/interventions.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		interventions.php
@@ -42,29 +42,29 @@ class CostbenefitprojectionControllerInterventions extends JControllerAdmin
 
 	public function exportData()
 	{
-		// [7354] Check for request forgeries
+		// [7521] Check for request forgeries
 		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
-		// [7356] check if export is allowed for this user.
+		// [7523] check if export is allowed for this user.
 		$user = JFactory::getUser();
 		if ($user->authorise('intervention.export', 'com_costbenefitprojection') && $user->authorise('core.export', 'com_costbenefitprojection'))
 		{
-			// [7360] Get the input
+			// [7527] Get the input
 			$input = JFactory::getApplication()->input;
 			$pks = $input->post->get('cid', array(), 'array');
-			// [7363] Sanitize the input
+			// [7530] Sanitize the input
 			JArrayHelper::toInteger($pks);
-			// [7365] Get the model
+			// [7532] Get the model
 			$model = $this->getModel('Interventions');
-			// [7367] get the data to export
+			// [7534] get the data to export
 			$data = $model->getExportData($pks);
 			if (CostbenefitprojectionHelper::checkArray($data))
 			{
-				// [7371] now set the data to the spreadsheet
+				// [7538] 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');
 			}
 		}
-		// [7376] Redirect to the list screen with error.
+		// [7543] 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()
 	{
-		// [7385] Check for request forgeries
+		// [7552] Check for request forgeries
 		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
-		// [7387] check if import is allowed for this user.
+		// [7554] check if import is allowed for this user.
 		$user = JFactory::getUser();
 		if ($user->authorise('intervention.import', 'com_costbenefitprojection') && $user->authorise('core.import', 'com_costbenefitprojection'))
 		{
-			// [7391] Get the import model
+			// [7558] Get the import model
 			$model = $this->getModel('Interventions');
-			// [7393] get the headers to import
+			// [7560] get the headers to import
 			$headers = $model->getExImPortHeaders();
 			if (CostbenefitprojectionHelper::checkObject($headers))
 			{
-				// [7397] Load headers to session.
+				// [7564] 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');
-				// [7403] Redirect to import view.
+				// [7570] 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;
 			}
 		}
-		// [7415] Redirect to the list screen with error.
+		// [7582] 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 ce89311f..66152d5b 100644
--- a/admin/controllers/scaling_factor.php
+++ b/admin/controllers/scaling_factor.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		scaling_factor.php
@@ -54,13 +54,13 @@ class CostbenefitprojectionControllerScaling_factor extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
-		// [9404] Access check.
+		// [9571] Access check.
 		$access = JFactory::getUser()->authorise('scaling_factor.access', 'com_costbenefitprojection');
 		if (!$access)
 		{
 			return false;
 		}
-		// [9415] In the absense of better information, revert to the component permissions.
+		// [9582] 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')
 	{
-		// [9558] get user object.
+		// [9725] get user object.
 		$user		= JFactory::getUser();
-		// [9560] get record id.
+		// [9727] 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
 			}
 		}
 
-		// [9567] Access check.
+		// [9734] 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)
 		{
-			// [9576] The record has been set. Check the record permissions.
+			// [9743] 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))
 				{
-					// [9598] Now test the owner is the user.
+					// [9765] Now test the owner is the user.
 					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
 					if (empty($ownerId))
 					{
-						// [9602] Need to do a lookup from the model.
+						// [9769] 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;
 					}
 
-					// [9610] If the owner matches 'me' then allow.
+					// [9777] 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;
 			}
 		}
-		// [9632] Since there is no permission, revert to the component permissions.
+		// [9799] 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 6816b0fa..3b05fbc8 100644
--- a/admin/controllers/scaling_factors.php
+++ b/admin/controllers/scaling_factors.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		scaling_factors.php
@@ -42,29 +42,29 @@ class CostbenefitprojectionControllerScaling_factors extends JControllerAdmin
 
 	public function exportData()
 	{
-		// [7354] Check for request forgeries
+		// [7521] Check for request forgeries
 		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
-		// [7356] check if export is allowed for this user.
+		// [7523] 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'))
 		{
-			// [7360] Get the input
+			// [7527] Get the input
 			$input = JFactory::getApplication()->input;
 			$pks = $input->post->get('cid', array(), 'array');
-			// [7363] Sanitize the input
+			// [7530] Sanitize the input
 			JArrayHelper::toInteger($pks);
-			// [7365] Get the model
+			// [7532] Get the model
 			$model = $this->getModel('Scaling_factors');
-			// [7367] get the data to export
+			// [7534] get the data to export
 			$data = $model->getExportData($pks);
 			if (CostbenefitprojectionHelper::checkArray($data))
 			{
-				// [7371] now set the data to the spreadsheet
+				// [7538] 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');
 			}
 		}
-		// [7376] Redirect to the list screen with error.
+		// [7543] 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()
 	{
-		// [7385] Check for request forgeries
+		// [7552] Check for request forgeries
 		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
-		// [7387] check if import is allowed for this user.
+		// [7554] 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'))
 		{
-			// [7391] Get the import model
+			// [7558] Get the import model
 			$model = $this->getModel('Scaling_factors');
-			// [7393] get the headers to import
+			// [7560] get the headers to import
 			$headers = $model->getExImPortHeaders();
 			if (CostbenefitprojectionHelper::checkObject($headers))
 			{
-				// [7397] Load headers to session.
+				// [7564] 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');
-				// [7403] Redirect to import view.
+				// [7570] 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;
 			}
 		}
-		// [7415] Redirect to the list screen with error.
+		// [7582] 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 b0757d71..3ddc3d3d 100644
--- a/admin/controllers/service_provider.php
+++ b/admin/controllers/service_provider.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		service_provider.php
@@ -54,13 +54,13 @@ class CostbenefitprojectionControllerService_provider extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
-		// [9404] Access check.
+		// [9571] Access check.
 		$access = JFactory::getUser()->authorise('service_provider.access', 'com_costbenefitprojection');
 		if (!$access)
 		{
 			return false;
 		}
-		// [9415] In the absense of better information, revert to the component permissions.
+		// [9582] 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')
 	{
-		// [9558] get user object.
+		// [9725] get user object.
 		$user		= JFactory::getUser();
-		// [9560] get record id.
+		// [9727] 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
 			}
 		}
 
-		// [9567] Access check.
+		// [9734] 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)
 		{
-			// [9576] The record has been set. Check the record permissions.
+			// [9743] 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))
 				{
-					// [9598] Now test the owner is the user.
+					// [9765] Now test the owner is the user.
 					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
 					if (empty($ownerId))
 					{
-						// [9602] Need to do a lookup from the model.
+						// [9769] 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;
 					}
 
-					// [9610] If the owner matches 'me' then allow.
+					// [9777] 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;
 			}
 		}
-		// [9632] Since there is no permission, revert to the component permissions.
+		// [9799] 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 79878d77..d32f9e75 100644
--- a/admin/controllers/service_providers.php
+++ b/admin/controllers/service_providers.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		service_providers.php
@@ -42,29 +42,29 @@ class CostbenefitprojectionControllerService_providers extends JControllerAdmin
 
 	public function exportData()
 	{
-		// [7354] Check for request forgeries
+		// [7521] Check for request forgeries
 		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
-		// [7356] check if export is allowed for this user.
+		// [7523] 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'))
 		{
-			// [7360] Get the input
+			// [7527] Get the input
 			$input = JFactory::getApplication()->input;
 			$pks = $input->post->get('cid', array(), 'array');
-			// [7363] Sanitize the input
+			// [7530] Sanitize the input
 			JArrayHelper::toInteger($pks);
-			// [7365] Get the model
+			// [7532] Get the model
 			$model = $this->getModel('Service_providers');
-			// [7367] get the data to export
+			// [7534] get the data to export
 			$data = $model->getExportData($pks);
 			if (CostbenefitprojectionHelper::checkArray($data))
 			{
-				// [7371] now set the data to the spreadsheet
+				// [7538] 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');
 			}
 		}
-		// [7376] Redirect to the list screen with error.
+		// [7543] 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()
 	{
-		// [7385] Check for request forgeries
+		// [7552] Check for request forgeries
 		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
-		// [7387] check if import is allowed for this user.
+		// [7554] 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'))
 		{
-			// [7391] Get the import model
+			// [7558] Get the import model
 			$model = $this->getModel('Service_providers');
-			// [7393] get the headers to import
+			// [7560] get the headers to import
 			$headers = $model->getExImPortHeaders();
 			if (CostbenefitprojectionHelper::checkObject($headers))
 			{
-				// [7397] Load headers to session.
+				// [7564] 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');
-				// [7403] Redirect to import view.
+				// [7570] 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;
 			}
 		}
-		// [7415] Redirect to the list screen with error.
+		// [7582] 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 e4c9313d..fd7f76ec 100644
--- a/admin/costbenefitprojection.php
+++ b/admin/costbenefitprojection.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		costbenefitprojection.php
diff --git a/admin/helpers/costbenefitprojection.php b/admin/helpers/costbenefitprojection.php
index 762bdb14..44d0bace 100644
--- a/admin/helpers/costbenefitprojection.php
+++ b/admin/helpers/costbenefitprojection.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		costbenefitprojection.php
@@ -752,23 +752,23 @@ abstract class CostbenefitprojectionHelper
 						$targetgroups = json_decode($help->groups, true);
 						if (!array_intersect($targetgroups, $groups))
 						{
-							// [1401] if user not in those target groups then remove the item
+							// [1482] if user not in those target groups then remove the item
 							unset($helps[$nr]);
 							continue;
 						}
 					}
-					// [1406] set the return type
+					// [1487] set the return type
 					switch ($help->type)
 					{
-						// [1409] set joomla article
+						// [1490] set joomla article
 						case 1:
 							return self::loadArticleLink($help->article);
 						break;
-						// [1413] set help text
+						// [1494] set help text
 						case 2:
 							return self::loadHelpTextLink($help->id);
 						break;
-						// [1417] set Link
+						// [1498] set Link
 						case 3:
 							return $help->url;
 						break;
@@ -848,33 +848,33 @@ abstract class CostbenefitprojectionHelper
 	*/
 	public static function createUser($new)
 	{
-		// [1635] load the user component language files if there is an error.
+		// [1716] load the user component language files if there is an error.
 		$lang = JFactory::getLanguage();
 		$extension = 'com_users';
 		$base_dir = JPATH_SITE;
 		$language_tag = 'en-GB';
 		$reload = true;
 		$lang->load($extension, $base_dir, $language_tag, $reload);
-		// [1642] load the user regestration model
+		// [1723] load the user regestration model
 		$model = self::getModel('registration', JPATH_ROOT. '/components/com_users', 'Users');
-		// [1644] make sure no activation is needed
+		// [1725] make sure no activation is needed
 		$useractivation = self::setParams('com_users','useractivation',0);
-		// [1646] make sure password is send
+		// [1727] make sure password is send
 		$sendpassword = self::setParams('com_users','sendpassword',1);
-		// [1648] Check if password was set
+		// [1729] Check if password was set
 		if (isset($new['password']) && isset($new['password2']) && self::checkString($new['password']) && self::checkString($new['password2']))
 		{
-			// [1651] Use the users passwords
+			// [1732] Use the users passwords
 			$password = $new['password'];
 			$password2 = $new['password2'];
 		}
 		else
 		{
-			// [1657] Set random password
+			// [1738] Set random password
 			$password = self::randomkey(8);
 			$password2 = $password;
 		}
-		// [1661] set username
+		// [1742] set username
 		if (isset($new['username']) && self::checkString($new['username']))
 		{
 			$new['username'] = self::safeString($new['username']);
@@ -883,7 +883,7 @@ abstract class CostbenefitprojectionHelper
 		{
 			$new['username'] = self::safeString($new['name']);			
 		}
-		// [1670] linup new user data
+		// [1751] linup new user data
 		$data = array(
 			'username' => $new['username'],
 			'name' => $new['name'],
@@ -891,13 +891,13 @@ abstract class CostbenefitprojectionHelper
 			'password1' => $password, // First password field
 			'password2' => $password2, // Confirm password field
 			'block' => 0 );
-		// [1678] register the new user
+		// [1759] register the new user
 		$userId = $model->register($data);
-		// [1680] set activation back to default
+		// [1761] set activation back to default
 		self::setParams('com_users','useractivation',$useractivation);
-		// [1682] set send password back to default
+		// [1763] set send password back to default
 		self::setParams('com_users','sendpassword',$sendpassword);
-		// [1684] if user is created
+		// [1765] if user is created
 		if ($userId > 0)
 		{
 			return $userId;
@@ -907,21 +907,21 @@ abstract class CostbenefitprojectionHelper
 
 	protected static function setParams($component,$target,$value)
 	{
-		// [1694] Get the params and set the new values
+		// [1775] Get the params and set the new values
 		$params = JComponentHelper::getParams($component);
 		$was = $params->get($target, null);
 		if ($was != $value)
 		{
 			$params->set($target, $value);
-			// [1700] Get a new database query instance
+			// [1781] Get a new database query instance
 			$db = JFactory::getDBO();
 			$query = $db->getQuery(true);
-			// [1703] Build the query
+			// [1784] Build the query
 			$query->update('#__extensions AS a');
 			$query->set('a.params = ' . $db->quote((string)$params));
 			$query->where('a.element = ' . $db->quote((string)$component));
 			
-			// [1708] Execute the query
+			// [1789] Execute the query
 			$db->setQuery($query);
 			$db->query();
 		}
@@ -997,7 +997,7 @@ abstract class CostbenefitprojectionHelper
 	{
 		if (strpos($content,'class="uk-') !== false)
 		{
-			// [2645] reset
+			// [2726] reset
 			$temp = array();
 			foreach (self::$uk_components as $looking => $add)
 			{
@@ -1006,15 +1006,15 @@ abstract class CostbenefitprojectionHelper
 					$temp[] = $looking;
 				}
 			}
-			// [2654] make sure uikit is loaded to config
+			// [2735] make sure uikit is loaded to config
 			if (strpos($content,'class="uk-') !== false)
 			{
 				self::$uikit = true;
 			}
-			// [2659] sorter
+			// [2740] sorter
 			if (self::checkArray($temp))
 			{
-				// [2662] merger
+				// [2743] merger
 				if (self::checkArray($classes))
 				{
 					$newTemp = array_merge($temp,$classes);
@@ -1035,37 +1035,37 @@ abstract class CostbenefitprojectionHelper
 	 */
 	public static function xls($rows,$fileName = null,$title = null,$subjectTab = null,$creator = 'Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb',$description = null,$category = null,$keywords = null,$modified = null)
 	{
-		// [1456] set the user
+		// [1537] set the user
 		$user = JFactory::getUser();
 		
-		// [1459] set fieldname if not set
+		// [1540] set fieldname if not set
 		if (!$fileName)
 		{
 			$fileName = 'exported_'.JFactory::getDate()->format('jS_F_Y');
 		}
-		// [1464] set modiefied if not set
+		// [1545] set modiefied if not set
 		if (!$modified)
 		{
 			$modified = $user->name;
 		}
-		// [1469] set title if not set
+		// [1550] set title if not set
 		if (!$title)
 		{
 			$title = 'Book1';
 		}
-		// [1474] set tab name if not set
+		// [1555] set tab name if not set
 		if (!$subjectTab)
 		{
 			$subjectTab = 'Sheet1';
 		}
 		
-		// [1480] make sure the file is loaded		
+		// [1561] make sure the file is loaded		
 		JLoader::import('PHPExcel', JPATH_COMPONENT_ADMINISTRATOR . '/helpers');
 		
-		// [1483] Create new PHPExcel object
+		// [1564] Create new PHPExcel object
 		$objPHPExcel = new PHPExcel();
 		
-		// [1486] Set document properties
+		// [1567] Set document properties
 		$objPHPExcel->getProperties()->setCreator($creator)
 									 ->setCompany('Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb')
 									 ->setLastModifiedBy($modified)
@@ -1084,7 +1084,7 @@ abstract class CostbenefitprojectionHelper
 			$objPHPExcel->getProperties()->setCategory($category);
 		}
 		
-		// [1505] Some styles
+		// [1586] Some styles
 		$headerStyles = array(
 			'font'  => array(
 				'bold'  => true,
@@ -1106,7 +1106,7 @@ abstract class CostbenefitprojectionHelper
 				'name'  => 'Verdana'
 		));
 		
-		// [1527] Add some data
+		// [1608] Add some data
 		if (self::checkArray($rows))
 		{
 			$i = 1;
@@ -1133,20 +1133,20 @@ abstract class CostbenefitprojectionHelper
 			return false;
 		}
 		
-		// [1554] Rename worksheet
+		// [1635] Rename worksheet
 		$objPHPExcel->getActiveSheet()->setTitle($subjectTab);
 		
-		// [1557] Set active sheet index to the first sheet, so Excel opens this as the first sheet
+		// [1638] Set active sheet index to the first sheet, so Excel opens this as the first sheet
 		$objPHPExcel->setActiveSheetIndex(0);
 		
-		// [1560] Redirect output to a client's web browser (Excel5)
+		// [1641] Redirect output to a client's web browser (Excel5)
 		header('Content-Type: application/vnd.ms-excel');
 		header('Content-Disposition: attachment;filename="'.$fileName.'.xls"');
 		header('Cache-Control: max-age=0');
-		// [1564] If you're serving to IE 9, then the following may be needed
+		// [1645] If you're serving to IE 9, then the following may be needed
 		header('Cache-Control: max-age=1');
 		
-		// [1567] If you're serving to IE over SSL, then the following may be needed
+		// [1648] If you're serving to IE over SSL, then the following may be needed
 		header ('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); // Date in the past
 		header ('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); // always modified
 		header ('Cache-Control: cache, must-revalidate'); // HTTP/1.1
@@ -1162,13 +1162,13 @@ abstract class CostbenefitprojectionHelper
 	*/
 	public static function getFileHeaders($dataType)
 	{		
-		// [1583] make sure the file is loaded		
+		// [1664] make sure the file is loaded		
 		JLoader::import('PHPExcel', JPATH_COMPONENT_ADMINISTRATOR . '/helpers');
-		// [1585] get session object
+		// [1666] get session object
 		$session 	= JFactory::getSession();
 		$package	= $session->get('package', null);
 		$package	= json_decode($package, true);
-		// [1589] set the headers
+		// [1670] set the headers
 		if(isset($package['dir']))
 		{
 			$inputFileType = PHPExcel_IOFactory::identify($package['dir']);
@@ -1969,12 +1969,12 @@ abstract class CostbenefitprojectionHelper
 	{
 		if ('advanced' == $type)
 		{
-			// [1287] Get the global params
+			// [1289] Get the global params
 			$params = JComponentHelper::getParams('com_costbenefitprojection', true);
 			$advanced_key = $params->get('advanced_key', null);
 			if ($advanced_key)
 			{
-				// [1292] load the file
+				// [1294] load the file
 				JLoader::import( 'vdm', JPATH_COMPONENT_ADMINISTRATOR);
 
 				$the = new VDM($advanced_key);
diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php
index 2a22454a..34a5b9c6 100644
--- a/admin/helpers/html/batch_.php
+++ b/admin/helpers/html/batch_.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		batch_.php
diff --git a/admin/helpers/sum.php b/admin/helpers/sum.php
index 383813e4..ed92e9e0 100644
--- a/admin/helpers/sum.php
+++ b/admin/helpers/sum.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		sum.php
diff --git a/admin/helpers/sumcombine.php b/admin/helpers/sumcombine.php
index ac34d07b..1516bfc5 100644
--- a/admin/helpers/sumcombine.php
+++ b/admin/helpers/sumcombine.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		sumcombine.php
diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php
index 81cf8ff7..3eaf217c 100644
--- a/admin/layouts/batchselection.php
+++ b/admin/layouts/batchselection.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		batchselection.php
diff --git a/admin/layouts/causerisk/details_above.php b/admin/layouts/causerisk/details_above.php
index 4df21315..7ddd01b6 100644
--- a/admin/layouts/causerisk/details_above.php
+++ b/admin/layouts/causerisk/details_above.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_above.php
diff --git a/admin/layouts/causerisk/details_left.php b/admin/layouts/causerisk/details_left.php
index cb2d86aa..18993a9b 100644
--- a/admin/layouts/causerisk/details_left.php
+++ b/admin/layouts/causerisk/details_left.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_left.php
diff --git a/admin/layouts/causerisk/publishing.php b/admin/layouts/causerisk/publishing.php
index e4577560..75137788 100644
--- a/admin/layouts/causerisk/publishing.php
+++ b/admin/layouts/causerisk/publishing.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publishing.php
diff --git a/admin/layouts/causerisk/publlshing.php b/admin/layouts/causerisk/publlshing.php
index 8108d8a0..0726570d 100644
--- a/admin/layouts/causerisk/publlshing.php
+++ b/admin/layouts/causerisk/publlshing.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publlshing.php
diff --git a/admin/layouts/company/age_groups_percentages_fullwidth.php b/admin/layouts/company/age_groups_percentages_fullwidth.php
index ebcf0047..966ac20e 100644
--- a/admin/layouts/company/age_groups_percentages_fullwidth.php
+++ b/admin/layouts/company/age_groups_percentages_fullwidth.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		age_groups_percentages_fullwidth.php
diff --git a/admin/layouts/company/age_groups_percentages_left.php b/admin/layouts/company/age_groups_percentages_left.php
index de7b07cd..0c248382 100644
--- a/admin/layouts/company/age_groups_percentages_left.php
+++ b/admin/layouts/company/age_groups_percentages_left.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		age_groups_percentages_left.php
diff --git a/admin/layouts/company/age_groups_percentages_right.php b/admin/layouts/company/age_groups_percentages_right.php
index 7be2384a..b19328ff 100644
--- a/admin/layouts/company/age_groups_percentages_right.php
+++ b/admin/layouts/company/age_groups_percentages_right.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		age_groups_percentages_right.php
diff --git a/admin/layouts/company/causerisk_selection_fullwidth.php b/admin/layouts/company/causerisk_selection_fullwidth.php
index c769aab4..e0de8078 100644
--- a/admin/layouts/company/causerisk_selection_fullwidth.php
+++ b/admin/layouts/company/causerisk_selection_fullwidth.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		causerisk_selection_fullwidth.php
diff --git a/admin/layouts/company/details_above.php b/admin/layouts/company/details_above.php
index 894791a5..4f071e00 100644
--- a/admin/layouts/company/details_above.php
+++ b/admin/layouts/company/details_above.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_above.php
diff --git a/admin/layouts/company/details_left.php b/admin/layouts/company/details_left.php
index 4bad9c32..591165be 100644
--- a/admin/layouts/company/details_left.php
+++ b/admin/layouts/company/details_left.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_left.php
diff --git a/admin/layouts/company/details_right.php b/admin/layouts/company/details_right.php
index 649c6417..b4878afb 100644
--- a/admin/layouts/company/details_right.php
+++ b/admin/layouts/company/details_right.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_right.php
diff --git a/admin/layouts/company/details_under.php b/admin/layouts/company/details_under.php
index 9daaa12e..f3cff850 100644
--- a/admin/layouts/company/details_under.php
+++ b/admin/layouts/company/details_under.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_under.php
diff --git a/admin/layouts/company/interventions_fullwidth.php b/admin/layouts/company/interventions_fullwidth.php
index c716c009..24515982 100644
--- a/admin/layouts/company/interventions_fullwidth.php
+++ b/admin/layouts/company/interventions_fullwidth.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		interventions_fullwidth.php
@@ -22,7 +22,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items	= $displayData->ynainterventions;
+$items	= $displayData->wrkinterventions;
 $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 e4577560..75137788 100644
--- a/admin/layouts/company/publishing.php
+++ b/admin/layouts/company/publishing.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publishing.php
diff --git a/admin/layouts/company/publlshing.php b/admin/layouts/company/publlshing.php
index 8108d8a0..0726570d 100644
--- a/admin/layouts/company/publlshing.php
+++ b/admin/layouts/company/publlshing.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publlshing.php
diff --git a/admin/layouts/company/scaling_factors_fullwidth.php b/admin/layouts/company/scaling_factors_fullwidth.php
index 6f1f6e8d..348def2d 100644
--- a/admin/layouts/company/scaling_factors_fullwidth.php
+++ b/admin/layouts/company/scaling_factors_fullwidth.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		scaling_factors_fullwidth.php
@@ -22,7 +22,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items	= $displayData->bqlscaling_factors;
+$items	= $displayData->rxjscaling_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 de7b07cd..0c248382 100644
--- a/admin/layouts/country/age_groups_percentages_left.php
+++ b/admin/layouts/country/age_groups_percentages_left.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		age_groups_percentages_left.php
diff --git a/admin/layouts/country/age_groups_percentages_right.php b/admin/layouts/country/age_groups_percentages_right.php
index 7be2384a..b19328ff 100644
--- a/admin/layouts/country/age_groups_percentages_right.php
+++ b/admin/layouts/country/age_groups_percentages_right.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		age_groups_percentages_right.php
diff --git a/admin/layouts/country/causerisk_selection_fullwidth.php b/admin/layouts/country/causerisk_selection_fullwidth.php
index e2f32d16..dbf44697 100644
--- a/admin/layouts/country/causerisk_selection_fullwidth.php
+++ b/admin/layouts/country/causerisk_selection_fullwidth.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		causerisk_selection_fullwidth.php
diff --git a/admin/layouts/country/companies_fullwidth.php b/admin/layouts/country/companies_fullwidth.php
index 5064d1b5..d989920d 100644
--- a/admin/layouts/country/companies_fullwidth.php
+++ b/admin/layouts/country/companies_fullwidth.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		companies_fullwidth.php
@@ -22,7 +22,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items	= $displayData->tnpcompanies;
+$items	= $displayData->myzcompanies;
 $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 68626715..77e7cebb 100644
--- a/admin/layouts/country/details_above.php
+++ b/admin/layouts/country/details_above.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_above.php
diff --git a/admin/layouts/country/details_left.php b/admin/layouts/country/details_left.php
index 574287e1..d0bcf06b 100644
--- a/admin/layouts/country/details_left.php
+++ b/admin/layouts/country/details_left.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_left.php
diff --git a/admin/layouts/country/details_right.php b/admin/layouts/country/details_right.php
index f4262f38..c03c8b84 100644
--- a/admin/layouts/country/details_right.php
+++ b/admin/layouts/country/details_right.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_right.php
diff --git a/admin/layouts/country/health_data_totals_left.php b/admin/layouts/country/health_data_totals_left.php
index 800c6ae6..df50de4a 100644
--- a/admin/layouts/country/health_data_totals_left.php
+++ b/admin/layouts/country/health_data_totals_left.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		health_data_totals_left.php
diff --git a/admin/layouts/country/health_data_totals_right.php b/admin/layouts/country/health_data_totals_right.php
index b4166096..5c9bc96c 100644
--- a/admin/layouts/country/health_data_totals_right.php
+++ b/admin/layouts/country/health_data_totals_right.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		health_data_totals_right.php
diff --git a/admin/layouts/country/public_details_fullwidth.php b/admin/layouts/country/public_details_fullwidth.php
index cad9beea..310b26f6 100644
--- a/admin/layouts/country/public_details_fullwidth.php
+++ b/admin/layouts/country/public_details_fullwidth.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		public_details_fullwidth.php
diff --git a/admin/layouts/country/publishing.php b/admin/layouts/country/publishing.php
index e4577560..75137788 100644
--- a/admin/layouts/country/publishing.php
+++ b/admin/layouts/country/publishing.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publishing.php
diff --git a/admin/layouts/country/publlshing.php b/admin/layouts/country/publlshing.php
index 8108d8a0..0726570d 100644
--- a/admin/layouts/country/publlshing.php
+++ b/admin/layouts/country/publlshing.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publlshing.php
diff --git a/admin/layouts/country/service_providers_fullwidth.php b/admin/layouts/country/service_providers_fullwidth.php
index ab886635..9ceb367e 100644
--- a/admin/layouts/country/service_providers_fullwidth.php
+++ b/admin/layouts/country/service_providers_fullwidth.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		service_providers_fullwidth.php
@@ -22,7 +22,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items	= $displayData->xrcservice_providers;
+$items	= $displayData->zrcservice_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 690c8968..f26f4402 100644
--- a/admin/layouts/currency/details_above.php
+++ b/admin/layouts/currency/details_above.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_above.php
diff --git a/admin/layouts/currency/details_left.php b/admin/layouts/currency/details_left.php
index 1ca30881..49fc550f 100644
--- a/admin/layouts/currency/details_left.php
+++ b/admin/layouts/currency/details_left.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_left.php
diff --git a/admin/layouts/currency/details_right.php b/admin/layouts/currency/details_right.php
index 433c2b7e..0e483a94 100644
--- a/admin/layouts/currency/details_right.php
+++ b/admin/layouts/currency/details_right.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_right.php
diff --git a/admin/layouts/currency/publishing.php b/admin/layouts/currency/publishing.php
index e4577560..75137788 100644
--- a/admin/layouts/currency/publishing.php
+++ b/admin/layouts/currency/publishing.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publishing.php
diff --git a/admin/layouts/currency/publlshing.php b/admin/layouts/currency/publlshing.php
index 8108d8a0..0726570d 100644
--- a/admin/layouts/currency/publlshing.php
+++ b/admin/layouts/currency/publlshing.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publlshing.php
diff --git a/admin/layouts/health_data/details_above.php b/admin/layouts/health_data/details_above.php
index 842f9144..eaf0c141 100644
--- a/admin/layouts/health_data/details_above.php
+++ b/admin/layouts/health_data/details_above.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_above.php
diff --git a/admin/layouts/health_data/details_left.php b/admin/layouts/health_data/details_left.php
index 6fb9d375..b8dc81eb 100644
--- a/admin/layouts/health_data/details_left.php
+++ b/admin/layouts/health_data/details_left.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_left.php
diff --git a/admin/layouts/health_data/details_right.php b/admin/layouts/health_data/details_right.php
index 9ccca47a..bc4acda6 100644
--- a/admin/layouts/health_data/details_right.php
+++ b/admin/layouts/health_data/details_right.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_right.php
diff --git a/admin/layouts/health_data/details_rightside.php b/admin/layouts/health_data/details_rightside.php
index 4eb84705..e400f09b 100644
--- a/admin/layouts/health_data/details_rightside.php
+++ b/admin/layouts/health_data/details_rightside.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_rightside.php
diff --git a/admin/layouts/health_data/publishing.php b/admin/layouts/health_data/publishing.php
index e4577560..75137788 100644
--- a/admin/layouts/health_data/publishing.php
+++ b/admin/layouts/health_data/publishing.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publishing.php
diff --git a/admin/layouts/health_data/publlshing.php b/admin/layouts/health_data/publlshing.php
index 8108d8a0..0726570d 100644
--- a/admin/layouts/health_data/publlshing.php
+++ b/admin/layouts/health_data/publlshing.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publlshing.php
diff --git a/admin/layouts/help_document/details_above.php b/admin/layouts/help_document/details_above.php
index cf413bec..a423bf4b 100644
--- a/admin/layouts/help_document/details_above.php
+++ b/admin/layouts/help_document/details_above.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_above.php
diff --git a/admin/layouts/help_document/details_fullwidth.php b/admin/layouts/help_document/details_fullwidth.php
index b7d81f26..6b29b6c5 100644
--- a/admin/layouts/help_document/details_fullwidth.php
+++ b/admin/layouts/help_document/details_fullwidth.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_fullwidth.php
diff --git a/admin/layouts/help_document/details_left.php b/admin/layouts/help_document/details_left.php
index bc70646f..64f71ab5 100644
--- a/admin/layouts/help_document/details_left.php
+++ b/admin/layouts/help_document/details_left.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_left.php
diff --git a/admin/layouts/help_document/details_right.php b/admin/layouts/help_document/details_right.php
index 7d35a28d..0b03a993 100644
--- a/admin/layouts/help_document/details_right.php
+++ b/admin/layouts/help_document/details_right.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_right.php
diff --git a/admin/layouts/help_document/details_under.php b/admin/layouts/help_document/details_under.php
index 9daaa12e..f3cff850 100644
--- a/admin/layouts/help_document/details_under.php
+++ b/admin/layouts/help_document/details_under.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_under.php
diff --git a/admin/layouts/help_document/publishing.php b/admin/layouts/help_document/publishing.php
index e4577560..75137788 100644
--- a/admin/layouts/help_document/publishing.php
+++ b/admin/layouts/help_document/publishing.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publishing.php
diff --git a/admin/layouts/help_document/publlshing.php b/admin/layouts/help_document/publlshing.php
index 594ce137..61a60321 100644
--- a/admin/layouts/help_document/publlshing.php
+++ b/admin/layouts/help_document/publlshing.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publlshing.php
diff --git a/admin/layouts/intervention/details_above.php b/admin/layouts/intervention/details_above.php
index 78274f21..7cdc77f9 100644
--- a/admin/layouts/intervention/details_above.php
+++ b/admin/layouts/intervention/details_above.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_above.php
diff --git a/admin/layouts/intervention/details_fullwidth.php b/admin/layouts/intervention/details_fullwidth.php
index 96abd5fc..a638025d 100644
--- a/admin/layouts/intervention/details_fullwidth.php
+++ b/admin/layouts/intervention/details_fullwidth.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_fullwidth.php
diff --git a/admin/layouts/intervention/details_under.php b/admin/layouts/intervention/details_under.php
index 9daaa12e..f3cff850 100644
--- a/admin/layouts/intervention/details_under.php
+++ b/admin/layouts/intervention/details_under.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_under.php
diff --git a/admin/layouts/intervention/publishing.php b/admin/layouts/intervention/publishing.php
index e4577560..75137788 100644
--- a/admin/layouts/intervention/publishing.php
+++ b/admin/layouts/intervention/publishing.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publishing.php
diff --git a/admin/layouts/intervention/publlshing.php b/admin/layouts/intervention/publlshing.php
index 594ce137..61a60321 100644
--- a/admin/layouts/intervention/publlshing.php
+++ b/admin/layouts/intervention/publlshing.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publlshing.php
diff --git a/admin/layouts/intervention/settings_fullwidth.php b/admin/layouts/intervention/settings_fullwidth.php
index bf450880..8382427a 100644
--- a/admin/layouts/intervention/settings_fullwidth.php
+++ b/admin/layouts/intervention/settings_fullwidth.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		settings_fullwidth.php
diff --git a/admin/layouts/intervention/settings_left.php b/admin/layouts/intervention/settings_left.php
index 8288c8d5..2d06610a 100644
--- a/admin/layouts/intervention/settings_left.php
+++ b/admin/layouts/intervention/settings_left.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		settings_left.php
diff --git a/admin/layouts/scaling_factor/details_above.php b/admin/layouts/scaling_factor/details_above.php
index db87a5a0..1f2642e5 100644
--- a/admin/layouts/scaling_factor/details_above.php
+++ b/admin/layouts/scaling_factor/details_above.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_above.php
diff --git a/admin/layouts/scaling_factor/details_left.php b/admin/layouts/scaling_factor/details_left.php
index 733f26e7..29378dbb 100644
--- a/admin/layouts/scaling_factor/details_left.php
+++ b/admin/layouts/scaling_factor/details_left.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_left.php
diff --git a/admin/layouts/scaling_factor/details_right.php b/admin/layouts/scaling_factor/details_right.php
index 65b0120b..76ed7236 100644
--- a/admin/layouts/scaling_factor/details_right.php
+++ b/admin/layouts/scaling_factor/details_right.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_right.php
diff --git a/admin/layouts/scaling_factor/publishing.php b/admin/layouts/scaling_factor/publishing.php
index e4577560..75137788 100644
--- a/admin/layouts/scaling_factor/publishing.php
+++ b/admin/layouts/scaling_factor/publishing.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publishing.php
diff --git a/admin/layouts/scaling_factor/publlshing.php b/admin/layouts/scaling_factor/publlshing.php
index 594ce137..61a60321 100644
--- a/admin/layouts/scaling_factor/publlshing.php
+++ b/admin/layouts/scaling_factor/publlshing.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publlshing.php
diff --git a/admin/layouts/service_provider/companies_fullwidth.php b/admin/layouts/service_provider/companies_fullwidth.php
index b68847a3..0ddfc1f1 100644
--- a/admin/layouts/service_provider/companies_fullwidth.php
+++ b/admin/layouts/service_provider/companies_fullwidth.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		companies_fullwidth.php
@@ -22,7 +22,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items	= $displayData->ogncompanies;
+$items	= $displayData->kfzcompanies;
 $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 13d0302f..255ebe55 100644
--- a/admin/layouts/service_provider/details_above.php
+++ b/admin/layouts/service_provider/details_above.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_above.php
diff --git a/admin/layouts/service_provider/details_fullwidth.php b/admin/layouts/service_provider/details_fullwidth.php
index d0468ee7..a1b12ff4 100644
--- a/admin/layouts/service_provider/details_fullwidth.php
+++ b/admin/layouts/service_provider/details_fullwidth.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_fullwidth.php
diff --git a/admin/layouts/service_provider/publishing.php b/admin/layouts/service_provider/publishing.php
index e4577560..75137788 100644
--- a/admin/layouts/service_provider/publishing.php
+++ b/admin/layouts/service_provider/publishing.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publishing.php
diff --git a/admin/layouts/service_provider/publlshing.php b/admin/layouts/service_provider/publlshing.php
index 594ce137..61a60321 100644
--- a/admin/layouts/service_provider/publlshing.php
+++ b/admin/layouts/service_provider/publlshing.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publlshing.php
diff --git a/admin/models/ajax.php b/admin/models/ajax.php
index 6c45e713..021b7017 100644
--- a/admin/models/ajax.php
+++ b/admin/models/ajax.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		ajax.php
@@ -37,13 +37,13 @@ class CostbenefitprojectionModelAjax extends JModelList
 		
 	}
 
-	// [9001] Used in company
+	// [9168] Used in company
 	public function getCalculatedResult($id,$data)
 	{
 		return CostbenefitprojectionHelper::calculate($id,$data);
 	}
 
-	// [9001] Used in intervention
+	// [9168] 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 810b9e28..117c6334 100644
--- a/admin/models/causerisk.php
+++ b/admin/models/causerisk.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		causerisk.php
@@ -110,7 +110,7 @@ class CostbenefitprojectionModelCauserisk extends JModelAdmin
 	 * @since   1.6
 	 */
 	public function getForm($data = array(), $loadData = true)
-	{		// [9651] Get the form.
+	{		// [9818] 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;
 
-		// [9736] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first.
+		// [9903] 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');
 		}
-		// [9741] The back end uses id so we use that the rest of the time and set it to 0 by default.
+		// [9908] 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();
 
-		// [9747] Check for existing item.
-		// [9748] Modify the form based on Edit State access controls.
+		// [9914] Check for existing item.
+		// [9915] 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')))
 		{
-			// [9761] Disable fields for display.
+			// [9928] Disable fields for display.
 			$form->setFieldAttribute('ordering', 'disabled', 'true');
 			$form->setFieldAttribute('published', 'disabled', 'true');
-			// [9764] Disable fields while saving.
+			// [9931] Disable fields while saving.
 			$form->setFieldAttribute('ordering', 'filter', 'unset');
 			$form->setFieldAttribute('published', 'filter', 'unset');
 		}
-		// [9769] Modify the form based on Edit Creaded By access controls.
+		// [9936] Modify the form based on Edit Creaded By access controls.
 		if (!$user->authorise('core.edit.created_by', 'com_costbenefitprojection'))
 		{
-			// [9781] Disable fields for display.
+			// [9948] Disable fields for display.
 			$form->setFieldAttribute('created_by', 'disabled', 'true');
-			// [9783] Disable fields for display.
+			// [9950] Disable fields for display.
 			$form->setFieldAttribute('created_by', 'readonly', 'true');
-			// [9785] Disable fields while saving.
+			// [9952] Disable fields while saving.
 			$form->setFieldAttribute('created_by', 'filter', 'unset');
 		}
-		// [9788] Modify the form based on Edit Creaded Date access controls.
+		// [9955] Modify the form based on Edit Creaded Date access controls.
 		if (!$user->authorise('core.edit.created', 'com_costbenefitprojection'))
 		{
-			// [9800] Disable fields for display.
+			// [9967] Disable fields for display.
 			$form->setFieldAttribute('created', 'disabled', 'true');
-			// [9802] Disable fields while saving.
+			// [9969] Disable fields while saving.
 			$form->setFieldAttribute('created', 'filter', 'unset');
 		}
 
@@ -196,7 +196,7 @@ class CostbenefitprojectionModelCauserisk extends JModelAdmin
 			}
 
 			$user = JFactory::getUser();
-			// [9952] The record has been set. Check the record permissions.
+			// [10119] 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)
 		{
-			// [10039] The record has been set. Check the record permissions.
+			// [10206] 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;
 			}
 		}
-		// [10056] In the absense of better information, revert to the component permissions.
+		// [10223] 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')
 	{
-		// [9864] Check specific edit permission then general edit permission.
+		// [10031] 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');
@@ -466,7 +466,7 @@ class CostbenefitprojectionModelCauserisk extends JModelAdmin
 	{
 		if (empty($this->batchSet))
 		{
-			// [5015] Set some needed variables.
+			// [5179] Set some needed variables.
 			$this->user 		= JFactory::getUser();
 			$this->table 		= $this->getTable();
 			$this->tableClassName	= get_class($this->table);
@@ -480,12 +480,12 @@ class CostbenefitprojectionModelCauserisk extends JModelAdmin
 			return false;
 		}
 
-		// [5035] get list of uniqe fields
+		// [5199] get list of uniqe fields
 		$uniqeFields = $this->getUniqeFields();
-		// [5037] remove move_copy from array
+		// [5201] remove move_copy from array
 		unset($values['move_copy']);
 
-		// [5040] make sure published is set
+		// [5204] make sure published is set
 		if (!isset($values['published']))
 		{
 			$values['published'] = 0;
@@ -497,21 +497,21 @@ class CostbenefitprojectionModelCauserisk extends JModelAdmin
 
 		$newIds = array();
 
-		// [5077] Parent exists so let's proceed
+		// [5241] Parent exists so let's proceed
 		while (!empty($pks))
 		{
-			// [5080] Pop the first ID off the stack
+			// [5244] Pop the first ID off the stack
 			$pk = array_shift($pks);
 
 			$this->table->reset();
 
-			// [5085] only allow copy if user may edit this item.
+			// [5249] only allow copy if user may edit this item.
 
 			if (!$this->user->authorise('causerisk.edit', $contexts[$pk]))
 
 			{
 
-				// [5095] Not fatal error
+				// [5259] Not fatal error
 
 				$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 
@@ -519,19 +519,19 @@ class CostbenefitprojectionModelCauserisk extends JModelAdmin
 
 			}
 
-			// [5100] Check that the row actually exists
+			// [5264] Check that the row actually exists
 			if (!$this->table->load($pk))
 			{
 				if ($error = $this->table->getError())
 				{
-					// [5105] Fatal error
+					// [5269] Fatal error
 					$this->setError($error);
 
 					return false;
 				}
 				else
 				{
-					// [5112] Not fatal error
+					// [5276] Not fatal error
 					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 					continue;
 				}
@@ -539,7 +539,7 @@ class CostbenefitprojectionModelCauserisk extends JModelAdmin
 
 			list($this->table->name, $this->table->alias) = $this->_generateNewTitle($this->table->alias, $this->table->name);
 
-			// [5148] insert all set values
+			// [5312] insert all set values
 			if (CostbenefitprojectionHelper::checkArray($values))
 			{
 				foreach ($values as $key => $value)
@@ -551,7 +551,7 @@ class CostbenefitprojectionModelCauserisk extends JModelAdmin
 				}
 			}
 
-			// [5160] update all uniqe fields
+			// [5324] update all uniqe fields
 			if (CostbenefitprojectionHelper::checkArray($uniqeFields))
 			{
 				foreach ($uniqeFields as $uniqeField)
@@ -560,13 +560,13 @@ class CostbenefitprojectionModelCauserisk extends JModelAdmin
 				}
 			}
 
-			// [5169] Reset the ID because we are making a copy
+			// [5333] Reset the ID because we are making a copy
 			$this->table->id = 0;
 
-			// [5172] TODO: Deal with ordering?
-			// [5173] $this->table->ordering	= 1;
+			// [5336] TODO: Deal with ordering?
+			// [5337] $this->table->ordering	= 1;
 
-			// [5175] Check the row.
+			// [5339] Check the row.
 			if (!$this->table->check())
 			{
 				$this->setError($this->table->getError());
@@ -579,7 +579,7 @@ class CostbenefitprojectionModelCauserisk extends JModelAdmin
 				$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
 			}
 
-			// [5188] Store the row.
+			// [5352] Store the row.
 			if (!$this->table->store())
 			{
 				$this->setError($this->table->getError());
@@ -587,14 +587,14 @@ class CostbenefitprojectionModelCauserisk extends JModelAdmin
 				return false;
 			}
 
-			// [5196] Get the new item ID
+			// [5360] Get the new item ID
 			$newId = $this->table->get('id');
 
-			// [5199] Add the new ID to the array
+			// [5363] Add the new ID to the array
 			$newIds[$pk] = $newId;
 		}
 
-		// [5203] Clean the cache
+		// [5367] Clean the cache
 		$this->cleanCache();
 
 		return $newIds;
@@ -615,7 +615,7 @@ class CostbenefitprojectionModelCauserisk extends JModelAdmin
 	{
 		if (empty($this->batchSet))
 		{
-			// [4817] Set some needed variables.
+			// [4981] Set some needed variables.
 			$this->user		= JFactory::getUser();
 			$this->table		= $this->getTable();
 			$this->tableClassName	= get_class($this->table);
@@ -630,15 +630,15 @@ class CostbenefitprojectionModelCauserisk extends JModelAdmin
 			return false;
 		}
 
-		// [4839] make sure published only updates if user has the permission.
+		// [5003] make sure published only updates if user has the permission.
 		if (isset($values['published']) && !$this->canDo->get('causerisk.edit.state'))
 		{
 			unset($values['published']);
 		}
-		// [4852] remove move_copy from array
+		// [5016] remove move_copy from array
 		unset($values['move_copy']);
 
-		// [4873] Parent exists so we proceed
+		// [5037] Parent exists so we proceed
 		foreach ($pks as $pk)
 		{
 			if (!$this->user->authorise('causerisk.edit', $contexts[$pk]))
@@ -648,30 +648,30 @@ class CostbenefitprojectionModelCauserisk extends JModelAdmin
 				return false;
 			}
 
-			// [4890] Check that the row actually exists
+			// [5054] Check that the row actually exists
 			if (!$this->table->load($pk))
 			{
 				if ($error = $this->table->getError())
 				{
-					// [4895] Fatal error
+					// [5059] Fatal error
 					$this->setError($error);
 
 					return false;
 				}
 				else
 				{
-					// [4902] Not fatal error
+					// [5066] Not fatal error
 					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 					continue;
 				}
 			}
 
-			// [4908] insert all set values.
+			// [5072] insert all set values.
 			if (CostbenefitprojectionHelper::checkArray($values))
 			{
 				foreach ($values as $key => $value)
 				{
-					// [4913] Do special action for access.
+					// [5077] Do special action for access.
 					if ('access' == $key && strlen($value) > 0)
 					{
 						$this->table->$key = $value;
@@ -684,7 +684,7 @@ class CostbenefitprojectionModelCauserisk extends JModelAdmin
 			}
 
 
-			// [4925] Check the row.
+			// [5089] Check the row.
 			if (!$this->table->check())
 			{
 				$this->setError($this->table->getError());
@@ -697,7 +697,7 @@ class CostbenefitprojectionModelCauserisk extends JModelAdmin
 				$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
 			}
 
-			// [4938] Store the row.
+			// [5102] Store the row.
 			if (!$this->table->store())
 			{
 				$this->setError($this->table->getError());
@@ -706,7 +706,7 @@ class CostbenefitprojectionModelCauserisk extends JModelAdmin
 			}
 		}
 
-		// [4947] Clean the cache
+		// [5111] Clean the cache
 		$this->cleanCache();
 
 		return true;
@@ -744,7 +744,7 @@ class CostbenefitprojectionModelCauserisk extends JModelAdmin
 			$data['params'] = (string) $params;
 		}
 
-		// [5229] Alter the name for save as copy
+		// [5393] Alter the name for save as copy
 		if ($input->get('task') == 'save2copy')
 		{
 			$origTable = clone $this->getTable();
@@ -767,7 +767,7 @@ class CostbenefitprojectionModelCauserisk extends JModelAdmin
 			$data['published'] = 0;
 		}
 
-		// [5256] Automatic handling of alias for empty fields
+		// [5420] 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)
@@ -798,10 +798,10 @@ class CostbenefitprojectionModelCauserisk extends JModelAdmin
 			}
 		}
 
-		// [5295] Alter the uniqe field for save as copy
+		// [5459] Alter the uniqe field for save as copy
 		if ($input->get('task') == 'save2copy')
 		{
-			// [5298] Automatic handling of other uniqe fields
+			// [5462] Automatic handling of other uniqe fields
 			$uniqeFields = $this->getUniqeFields();
 			if (CostbenefitprojectionHelper::checkArray($uniqeFields))
 			{
@@ -855,7 +855,7 @@ class CostbenefitprojectionModelCauserisk extends JModelAdmin
 	protected function _generateNewTitle($alias, $title)
 	{
 
-		// [5329] Alter the title & alias
+		// [5493] 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 817cc57d..a947c512 100644
--- a/admin/models/causesrisks.php
+++ b/admin/models/causesrisks.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		causesrisks.php
@@ -95,16 +95,16 @@ class CostbenefitprojectionModelCausesrisks extends JModelList
 	 */
 	public function getItems()
 	{ 
-		// [10621] check in items
+		// [10792] check in items
 		$this->checkInNow();
 
 		// load parent items
 		$items = parent::getItems();
 
-		// [10696] set values to display correctly.
+		// [10867] set values to display correctly.
 		if (CostbenefitprojectionHelper::checkArray($items))
 		{
-			// [10699] get user object.
+			// [10870] get user object.
 			$user = JFactory::getUser();
 			foreach ($items as $nr => &$item)
 			{
@@ -129,19 +129,19 @@ class CostbenefitprojectionModelCausesrisks extends JModelList
 	 */
 	protected function getListQuery()
 	{
-		// [7482] Get the user object.
+		// [7649] Get the user object.
 		$user = JFactory::getUser();
-		// [7484] Create a new query object.
+		// [7651] Create a new query object.
 		$db = JFactory::getDBO();
 		$query = $db->getQuery(true);
 
-		// [7487] Select some fields
+		// [7654] Select some fields
 		$query->select('a.*');
 
-		// [7494] From the costbenefitprojection_item table
+		// [7661] From the costbenefitprojection_item table
 		$query->from($db->quoteName('#__costbenefitprojection_causerisk', 'a'));
 
-		// [7508] Filter by published state
+		// [7675] 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)');
 		}
 
-		// [7520] Join over the asset groups.
+		// [7687] Join over the asset groups.
 		$query->select('ag.title AS access_level');
 		$query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
-		// [7523] Filter by access level.
+		// [7690] Filter by access level.
 		if ($access = $this->getState('filter.access'))
 		{
 			$query->where('a.access = ' . (int) $access);
 		}
-		// [7528] Implement View Level Access
+		// [7695] Implement View Level Access
 		if (!$user->authorise('core.options', 'com_costbenefitprojection'))
 		{
 			$groups = implode(',', $user->getAuthorisedViewLevels());
 			$query->where('a.access IN (' . $groups . ')');
 		}
-		// [7605] Filter by search.
+		// [7772] Filter by search.
 		$search = $this->getState('filter.search');
 		if (!empty($search))
 		{
@@ -182,7 +182,7 @@ class CostbenefitprojectionModelCausesrisks extends JModelList
 		}
 
 
-		// [7564] Add the list ordering clause.
+		// [7731] 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)
 	{
-		// [7272] setup the query
+		// [7439] setup the query
 		if (CostbenefitprojectionHelper::checkArray($pks))
 		{
-			// [7275] Get the user object.
+			// [7442] Get the user object.
 			$user = JFactory::getUser();
-			// [7277] Create a new query object.
+			// [7444] Create a new query object.
 			$db = JFactory::getDBO();
 			$query = $db->getQuery(true);
 
-			// [7280] Select some fields
+			// [7447] Select some fields
 			$query->select('a.*');
 
-			// [7282] From the costbenefitprojection_causerisk table
+			// [7449] From the costbenefitprojection_causerisk table
 			$query->from($db->quoteName('#__costbenefitprojection_causerisk', 'a'));
 			$query->where('a.id IN (' . implode(',',$pks) . ')');
-			// [7292] Implement View Level Access
+			// [7459] Implement View Level Access
 			if (!$user->authorise('core.options', 'com_costbenefitprojection'))
 			{
 				$groups = implode(',', $user->getAuthorisedViewLevels());
 				$query->where('a.access IN (' . $groups . ')');
 			}
 
-			// [7299] Order the results by ordering
+			// [7466] Order the results by ordering
 			$query->order('a.ordering  ASC');
 
-			// [7301] Load the items
+			// [7468] Load the items
 			$db->setQuery($query);
 			$db->execute();
 			if ($db->getNumRows())
 			{
 				$items = $db->loadObjectList();
 
-				// [10696] set values to display correctly.
+				// [10867] set values to display correctly.
 				if (CostbenefitprojectionHelper::checkArray($items))
 				{
-					// [10699] get user object.
+					// [10870] get user object.
 					$user = JFactory::getUser();
 					foreach ($items as $nr => &$item)
 					{
@@ -246,13 +246,13 @@ class CostbenefitprojectionModelCausesrisks extends JModelList
 							continue;
 						}
 
-						// [10909] unset the values we don't want exported.
+						// [11080] unset the values we don't want exported.
 						unset($item->asset_id);
 						unset($item->checked_out);
 						unset($item->checked_out_time);
 					}
 				}
-				// [10918] Add headers to items array.
+				// [11089] Add headers to items array.
 				$headers = $this->getExImPortHeaders();
 				if (CostbenefitprojectionHelper::checkObject($headers))
 				{
@@ -271,13 +271,13 @@ class CostbenefitprojectionModelCausesrisks extends JModelList
 	*/
 	public function getExImPortHeaders()
 	{
-		// [7321] Get a db connection.
+		// [7488] Get a db connection.
 		$db = JFactory::getDbo();
-		// [7323] get the columns
+		// [7490] get the columns
 		$columns = $db->getTableColumns("#__costbenefitprojection_causerisk");
 		if (CostbenefitprojectionHelper::checkArray($columns))
 		{
-			// [7327] remove the headers you don't import/export.
+			// [7494] 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 = '')
 	{
-		// [10244] Compile the store id.
+		// [10415] 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()
 	{
-		// [10637] Get set check in time
+		// [10808] Get set check in time
 		$time = JComponentHelper::getParams('com_costbenefitprojection')->get('check_in');
 		
 		if ($time)
 		{
 
-			// [10642] Get a db connection.
+			// [10813] Get a db connection.
 			$db = JFactory::getDbo();
-			// [10644] reset query
+			// [10815] 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())
 			{
-				// [10652] Get Yesterdays date
+				// [10823] Get Yesterdays date
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// [10654] reset query
+				// [10825] reset query
 				$query = $db->getQuery(true);
 
-				// [10656] Fields to update.
+				// [10827] Fields to update.
 				$fields = array(
 					$db->quoteName('checked_out_time') . '=\'0000-00-00 00:00:00\'',
 					$db->quoteName('checked_out') . '=0'
 				);
 
-				// [10661] Conditions for which records should be updated.
+				// [10832] Conditions for which records should be updated.
 				$conditions = array(
 					$db->quoteName('checked_out') . '!=0', 
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);
 
-				// [10666] Check table
+				// [10837] 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 e30e2825..33fe0b67 100644
--- a/admin/models/combinedresults.php
+++ b/admin/models/combinedresults.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		combinedresults.php
@@ -90,32 +90,32 @@ class CostbenefitprojectionModelCombinedresults extends JModelList
 				JFactory::getApplication()->redirect('index.php?option=com_costbenefitprojection&view=cpanel');
 			}
 		} 
-		// [2952] Make sure all records load, since no pagination allowed.
+		// [3033] Make sure all records load, since no pagination allowed.
 		$this->setState('list.limit', 0);
-		// [2954] Get a db connection.
+		// [3035] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2957] Create a new query object.
+		// [3038] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [1820] Get from #__costbenefitprojection_company as a
+		// [1901] Get from #__costbenefitprojection_company as a
 		$query->select($db->quoteName(
 			array('a.id','a.name','a.user','a.department','a.per','a.country','a.serviceprovider','a.datayear','a.working_days','a.total_salary','a.total_healthcare','a.productivity_losses','a.males','a.females','a.medical_turnovers_males','a.medical_turnovers_females','a.sick_leave_males','a.sick_leave_females','a.percentmale','a.percentfemale','a.causesrisks','a.published','a.access'),
 			array('id','name','user','department','per','country','serviceprovider','datayear','working_days','total_salary','total_healthcare','productivity_losses','males','females','medical_turnovers_males','medical_turnovers_females','sick_leave_males','sick_leave_females','percentmale','percentfemale','causesrisks','published','access')));
 		$query->from($db->quoteName('#__costbenefitprojection_company', 'a'));
 
-		// [1820] Get from #__costbenefitprojection_country as e
+		// [1901] Get from #__costbenefitprojection_country as e
 		$query->select($db->quoteName(
 			array('e.id','e.name','e.alias','e.user','e.currency','e.datayear','e.worldzone','e.codethree','e.codetwo','e.working_days','e.presenteeism','e.medical_turnovers','e.sick_leave','e.healthcare','e.productivity_losses','e.publicname','e.publicemail','e.publicnumber','e.publicaddress','e.percentmale','e.percentfemale','e.causesrisks','e.maledeath','e.femaledeath','e.maleyld','e.femaleyld','e.access'),
 			array('country_id','country_name','country_alias','country_user','country_currency','country_datayear','country_worldzone','country_codethree','country_codetwo','country_working_days','country_presenteeism','country_medical_turnovers','country_sick_leave','country_healthcare','country_productivity_losses','country_publicname','country_publicemail','country_publicnumber','country_publicaddress','country_percentmale','country_percentfemale','country_causesrisks','country_maledeath','country_femaledeath','country_maleyld','country_femaleyld','country_access')));
 		$query->join('LEFT', ($db->quoteName('#__costbenefitprojection_country', 'e')) . ' ON (' . $db->quoteName('a.country') . ' = ' . $db->quoteName('e.id') . ')');
 
-		// [1820] Get from #__costbenefitprojection_currency as f
+		// [1901] Get from #__costbenefitprojection_currency as f
 		$query->select($db->quoteName(
 			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') . ')');
-		// [2152] Check if $ids is an array with values.
+		// [2233] 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;
 		}
 
-		// [2970] return the query object
+		// [3051] return the query object
 		return $query;
 	}
 
@@ -152,89 +152,89 @@ class CostbenefitprojectionModelCombinedresults extends JModelList
 		// Get the global params
 		$globalParams = JComponentHelper::getParams('com_costbenefitprojection', true);
 
-		// [3059] Get the advanced encription.
+		// [3140] Get the advanced encription.
 		$advancedkey = CostbenefitprojectionHelper::getCryptKey('advanced');
-		// [3061] Get the encription object.
+		// [3142] Get the encription object.
 		$advanced = new FOFEncryptAes($advancedkey, 256);
 
-		// [2985] Convert the parameter fields into objects.
+		// [3066] Convert the parameter fields into objects.
 		foreach ($items as $nr => &$item)
 		{
-			// [2988] Always create a slug for sef URL's
+			// [3069] 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)))
 			{
-				// [2022] Decode medical_turnovers_males
+				// [2103] 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)))
 			{
-				// [2022] Decode sick_leave_males
+				// [2103] 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)))
 			{
-				// [2022] Decode males
+				// [2103] Decode males
 				$item->males = rtrim($advanced->decryptString($item->males), "\0");
 			}
 			if (CostbenefitprojectionHelper::checkString($item->causesrisks))
 			{
-				// [2022] Decode causesrisks
+				// [2103] 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)))
 			{
-				// [2022] Decode females
+				// [2103] 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)))
 			{
-				// [2022] Decode medical_turnovers_females
+				// [2103] 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)))
 			{
-				// [2022] Decode sick_leave_females
+				// [2103] 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)))
 			{
-				// [2022] Decode total_salary
+				// [2103] 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)))
 			{
-				// [2022] Decode total_healthcare
+				// [2103] Decode total_healthcare
 				$item->total_healthcare = rtrim($advanced->decryptString($item->total_healthcare), "\0");
 			}
 			if (CostbenefitprojectionHelper::checkString($item->country_causesrisks))
 			{
-				// [2022] Decode country_causesrisks
+				// [2103] Decode country_causesrisks
 				$item->country_causesrisks = json_decode($item->country_causesrisks, true);
 			}
-			// [2037] Make sure the content prepare plugins fire on country_publicaddress.
+			// [2118] Make sure the content prepare plugins fire on country_publicaddress.
 			$item->country_publicaddress = JHtml::_('content.prepare',$item->country_publicaddress);
-			// [2039] Checking if country_publicaddress has uikit components that must be loaded.
+			// [2120] Checking if country_publicaddress has uikit components that must be loaded.
 			$this->uikitComp = CostbenefitprojectionHelper::getUikitComp($item->country_publicaddress,$this->uikitComp);
-			// [2342] set the global causesrisks value.
+			// [2423] set the global causesrisks value.
 			$this->a_causesrisks = $item->causesrisks;
-			// [2342] set the global datayear value.
+			// [2423] set the global datayear value.
 			$this->a_datayear = $item->datayear;
-			// [2342] set the global datayear value.
+			// [2423] set the global datayear value.
 			$this->e_datayear = $item->country_datayear;
-			// [2342] set the global causesrisks value.
+			// [2423] set the global causesrisks value.
 			$this->e_causesrisks = $item->country_causesrisks;
-			// [2070] set countryCountryHealth_dataB to the $item object.
+			// [2151] set countryCountryHealth_dataB to the $item object.
 			$item->countryCountryHealth_dataB = $this->getCountryCountryHealth_dataBcbb_B($item->country);
-			// [2070] set idCompanyScaling_factorC to the $item object.
+			// [2151] set idCompanyScaling_factorC to the $item object.
 			$item->idCompanyScaling_factorC = $this->getIdCompanyScaling_factorBcbb_C($item->id);
-			// [2070] set idCompanyInterventionD to the $item object.
+			// [2151] set idCompanyInterventionD to the $item object.
 			$item->idCompanyInterventionD = $this->getIdCompanyInterventionBcbb_D($item->id);
-			// [2070] set causesrisksIdCauseriskG to the $item object.
+			// [2151] set causesrisksIdCauseriskG to the $item object.
 			$item->causesrisksIdCauseriskG = $this->getCausesrisksIdCauseriskBcbb_G($item->causesrisks);
-			// [2070] set countryCountryHealth_dataBB to the $item object.
+			// [2151] set countryCountryHealth_dataBB to the $item object.
 			$item->countryCountryHealth_dataBB = $this->getCountryCountryHealth_dataBcbb_BB($item->country);
-			// [2070] set causesrisksIdCauseriskGG to the $item object.
+			// [2151] 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)
 	{
-		// [2750] Get a db connection.
+		// [2831] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2752] Create a new query object.
+		// [2833] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2754] Get from #__costbenefitprojection_health_data as b
+		// [2835] 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));
-		// [2152] Check if $this->a_causesrisks is an array with values.
+		// [2233] 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');
 
-		// [2808] Reset the query using our newly populated query object.
+		// [2889] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2811] check if there was data returned
+		// [2892] 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)
 	{
-		// [2750] Get a db connection.
+		// [2831] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2752] Create a new query object.
+		// [2833] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2754] Get from #__costbenefitprojection_scaling_factor as c
+		// [2835] 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');
 
-		// [2808] Reset the query using our newly populated query object.
+		// [2889] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2811] check if there was data returned
+		// [2892] check if there was data returned
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [2864] Convert the parameter fields into objects.
+			// [2945] Convert the parameter fields into objects.
 			foreach ($items as $nr => &$item)
 			{
-				// [2037] Make sure the content prepare plugins fire on reference.
+				// [2118] Make sure the content prepare plugins fire on reference.
 				$item->reference = JHtml::_('content.prepare',$item->reference);
-				// [2039] Checking if reference has uikit components that must be loaded.
+				// [2120] 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)
 	{
-		// [2750] Get a db connection.
+		// [2831] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2752] Create a new query object.
+		// [2833] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2754] Get from #__costbenefitprojection_intervention as d
+		// [2835] 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');
 
-		// [2808] Reset the query using our newly populated query object.
+		// [2889] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2811] check if there was data returned
+		// [2892] check if there was data returned
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [2864] Convert the parameter fields into objects.
+			// [2945] Convert the parameter fields into objects.
 			foreach ($items as $nr => &$item)
 			{
-				// [2037] Make sure the content prepare plugins fire on description.
+				// [2118] Make sure the content prepare plugins fire on description.
 				$item->description = JHtml::_('content.prepare',$item->description);
-				// [2039] Checking if description has uikit components that must be loaded.
+				// [2120] Checking if description has uikit components that must be loaded.
 				$this->uikitComp = CostbenefitprojectionHelper::getUikitComp($item->description,$this->uikitComp);
-				// [2037] Make sure the content prepare plugins fire on reference.
+				// [2118] Make sure the content prepare plugins fire on reference.
 				$item->reference = JHtml::_('content.prepare',$item->reference);
-				// [2039] Checking if reference has uikit components that must be loaded.
+				// [2120] 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)
 	{
-		// [2750] Get a db connection.
+		// [2831] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2752] Create a new query object.
+		// [2833] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2754] Get from #__costbenefitprojection_causerisk as g
+		// [2835] 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'));
 
-		// [2760] Check if $causesrisks is an array with values.
+		// [2841] 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;
 		}
 
-		// [2808] Reset the query using our newly populated query object.
+		// [2889] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2811] check if there was data returned
+		// [2892] check if there was data returned
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [2864] Convert the parameter fields into objects.
+			// [2945] Convert the parameter fields into objects.
 			foreach ($items as $nr => &$item)
 			{
-				// [2037] Make sure the content prepare plugins fire on description.
+				// [2118] Make sure the content prepare plugins fire on description.
 				$item->description = JHtml::_('content.prepare',$item->description);
-				// [2039] Checking if description has uikit components that must be loaded.
+				// [2120] 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)
 	{
-		// [2750] Get a db connection.
+		// [2831] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2752] Create a new query object.
+		// [2833] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2754] Get from #__costbenefitprojection_health_data as bb
+		// [2835] 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));
-		// [2152] Check if $this->e_causesrisks is an array with values.
+		// [2233] 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');
 
-		// [2808] Reset the query using our newly populated query object.
+		// [2889] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2811] check if there was data returned
+		// [2892] 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)
 	{
-		// [2750] Get a db connection.
+		// [2831] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2752] Create a new query object.
+		// [2833] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2754] Get from #__costbenefitprojection_causerisk as gg
+		// [2835] 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'));
 
-		// [2760] Check if $causesrisks is an array with values.
+		// [2841] 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;
 		}
 
-		// [2808] Reset the query using our newly populated query object.
+		// [2889] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2811] check if there was data returned
+		// [2892] check if there was data returned
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [2864] Convert the parameter fields into objects.
+			// [2945] Convert the parameter fields into objects.
 			foreach ($items as $nr => &$item)
 			{
-				// [2037] Make sure the content prepare plugins fire on description.
+				// [2118] Make sure the content prepare plugins fire on description.
 				$item->description = JHtml::_('content.prepare',$item->description);
-				// [2039] Checking if description has uikit components that must be loaded.
+				// [2120] 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 a61d2e68..7fce0a35 100644
--- a/admin/models/companies.php
+++ b/admin/models/companies.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		companies.php
@@ -111,16 +111,16 @@ class CostbenefitprojectionModelCompanies extends JModelList
 	 */
 	public function getItems()
 	{ 
-		// [10621] check in items
+		// [10792] check in items
 		$this->checkInNow();
 
 		// load parent items
 		$items = parent::getItems();
 
-		// [10696] set values to display correctly.
+		// [10867] set values to display correctly.
 		if (CostbenefitprojectionHelper::checkArray($items))
 		{
-			// [10699] get user object.
+			// [10870] get user object.
 			$user = JFactory::getUser();
 			foreach ($items as $nr => &$item)
 			{
@@ -134,14 +134,14 @@ class CostbenefitprojectionModelCompanies extends JModelList
 			}
 		} 
 
-		// [10962] set selection value to a translatable value
+		// [11133] set selection value to a translatable value
 		if (CostbenefitprojectionHelper::checkArray($items))
 		{
 			foreach ($items as $nr => &$item)
 			{
-				// [10969] convert department
+				// [11140] convert department
 				$item->department = $this->selectionTranslation($item->department, 'department');
-				// [10969] convert per
+				// [11140] convert per
 				$item->per = $this->selectionTranslation($item->per, 'per');
 			}
 		}
@@ -158,27 +158,27 @@ class CostbenefitprojectionModelCompanies extends JModelList
 	*/
 	public function selectionTranslation($value,$name)
 	{
-		// [10995] Array of department language strings
+		// [11166] Array of department language strings
 		if ($name == 'department')
 		{
 			$departmentArray = array(
 				1 => 'COM_COSTBENEFITPROJECTION_COMPANY_BASIC',
 				2 => 'COM_COSTBENEFITPROJECTION_COMPANY_ADVANCED'
 			);
-			// [11026] Now check if value is found in this array
+			// [11197] Now check if value is found in this array
 			if (isset($departmentArray[$value]) && CostbenefitprojectionHelper::checkString($departmentArray[$value]))
 			{
 				return $departmentArray[$value];
 			}
 		}
-		// [10995] Array of per language strings
+		// [11166] Array of per language strings
 		if ($name == 'per')
 		{
 			$perArray = array(
 				1 => 'COM_COSTBENEFITPROJECTION_COMPANY_OPEN',
 				0 => 'COM_COSTBENEFITPROJECTION_COMPANY_LOCKED'
 			);
-			// [11026] Now check if value is found in this array
+			// [11197] 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()
 	{
-		// [7482] Get the user object.
+		// [7649] Get the user object.
 		$user = JFactory::getUser();
-		// [7484] Create a new query object.
+		// [7651] Create a new query object.
 		$db = JFactory::getDBO();
 		$query = $db->getQuery(true);
 
-		// [7487] Select some fields
+		// [7654] Select some fields
 		$query->select('a.*');
 
-		// [7494] From the costbenefitprojection_item table
+		// [7661] 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
 			}
 		}
 
-		// [7635] From the users table.
+		// [7802] 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') . ')');
 
-		// [7635] From the costbenefitprojection_country table.
+		// [7802] 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') . ')');
 
-		// [7635] From the costbenefitprojection_service_provider table.
+		// [7802] 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') . ')');
 
-		// [7508] Filter by published state
+		// [7675] 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)');
 		}
 
-		// [7520] Join over the asset groups.
+		// [7687] Join over the asset groups.
 		$query->select('ag.title AS access_level');
 		$query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
-		// [7523] Filter by access level.
+		// [7690] Filter by access level.
 		if ($access = $this->getState('filter.access'))
 		{
 			$query->where('a.access = ' . (int) $access);
 		}
-		// [7528] Implement View Level Access
+		// [7695] Implement View Level Access
 		if (!$user->authorise('core.options', 'com_costbenefitprojection'))
 		{
 			$groups = implode(',', $user->getAuthorisedViewLevels());
 			$query->where('a.access IN (' . $groups . ')');
 		}
-		// [7605] Filter by search.
+		// [7772] Filter by search.
 		$search = $this->getState('filter.search');
 		if (!empty($search))
 		{
@@ -275,28 +275,28 @@ class CostbenefitprojectionModelCompanies extends JModelList
 			}
 		}
 
-		// [7848] Filter by Department.
+		// [8015] Filter by Department.
 		if ($department = $this->getState('filter.department'))
 		{
 			$query->where('a.department = ' . $db->quote($db->escape($department, true)));
 		}
-		// [7839] Filter by country.
+		// [8006] Filter by country.
 		if ($country = $this->getState('filter.country'))
 		{
 			$query->where('a.country = ' . $db->quote($db->escape($country, true)));
 		}
-		// [7839] Filter by serviceprovider.
+		// [8006] Filter by serviceprovider.
 		if ($serviceprovider = $this->getState('filter.serviceprovider'))
 		{
 			$query->where('a.serviceprovider = ' . $db->quote($db->escape($serviceprovider, true)));
 		}
-		// [7848] Filter by Per.
+		// [8015] Filter by Per.
 		if ($per = $this->getState('filter.per'))
 		{
 			$query->where('a.per = ' . $db->quote($db->escape($per, true)));
 		}
 
-		// [7564] Add the list ordering clause.
+		// [7731] 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)
 	{
-		// [7272] setup the query
+		// [7439] setup the query
 		if (CostbenefitprojectionHelper::checkArray($pks))
 		{
-			// [7275] Get the user object.
+			// [7442] Get the user object.
 			$user = JFactory::getUser();
-			// [7277] Create a new query object.
+			// [7444] Create a new query object.
 			$db = JFactory::getDBO();
 			$query = $db->getQuery(true);
 
-			// [7280] Select some fields
+			// [7447] Select some fields
 			$query->select('a.*');
 
-			// [7282] From the costbenefitprojection_company table
+			// [7449] 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');
 			}
 		}
-			// [7292] Implement View Level Access
+			// [7459] Implement View Level Access
 			if (!$user->authorise('core.options', 'com_costbenefitprojection'))
 			{
 				$groups = implode(',', $user->getAuthorisedViewLevels());
 				$query->where('a.access IN (' . $groups . ')');
 			}
 
-			// [7299] Order the results by ordering
+			// [7466] Order the results by ordering
 			$query->order('a.ordering  ASC');
 
-			// [7301] Load the items
+			// [7468] Load the items
 			$db->setQuery($query);
 			$db->execute();
 			if ($db->getNumRows())
 			{
 				$items = $db->loadObjectList();
 
-				// [10945] Get the advanced encription key.
+				// [11116] Get the advanced encription key.
 				$advancedkey = CostbenefitprojectionHelper::getCryptKey('advanced');
-				// [10947] Get the encription object.
+				// [11118] Get the encription object.
 				$advanced = new FOFEncryptAes($advancedkey, 256);
 
-				// [10696] set values to display correctly.
+				// [10867] set values to display correctly.
 				if (CostbenefitprojectionHelper::checkArray($items))
 				{
-					// [10699] get user object.
+					// [10870] 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)))
 						{
-							// [10839] decrypt medical_turnovers_males
+							// [11010] 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)))
 						{
-							// [10839] decrypt sick_leave_males
+							// [11010] 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)))
 						{
-							// [10839] decrypt males
+							// [11010] decrypt males
 							$item->males = $advanced->decryptString($item->males);
 						}
 						if ($advancedkey && !is_numeric($item->females) && $item->females === base64_encode(base64_decode($item->females, true)))
 						{
-							// [10839] decrypt females
+							// [11010] 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)))
 						{
-							// [10839] decrypt medical_turnovers_females
+							// [11010] 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)))
 						{
-							// [10839] decrypt sick_leave_females
+							// [11010] 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)))
 						{
-							// [10839] decrypt total_salary
+							// [11010] 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)))
 						{
-							// [10839] decrypt total_healthcare
+							// [11010] decrypt total_healthcare
 							$item->total_healthcare = $advanced->decryptString($item->total_healthcare);
 						}
-						// [10909] unset the values we don't want exported.
+						// [11080] unset the values we don't want exported.
 						unset($item->asset_id);
 						unset($item->checked_out);
 						unset($item->checked_out_time);
 					}
 				}
-				// [10918] Add headers to items array.
+				// [11089] Add headers to items array.
 				$headers = $this->getExImPortHeaders();
 				if (CostbenefitprojectionHelper::checkObject($headers))
 				{
@@ -447,13 +447,13 @@ class CostbenefitprojectionModelCompanies extends JModelList
 	*/
 	public function getExImPortHeaders()
 	{
-		// [7321] Get a db connection.
+		// [7488] Get a db connection.
 		$db = JFactory::getDbo();
-		// [7323] get the columns
+		// [7490] get the columns
 		$columns = $db->getTableColumns("#__costbenefitprojection_company");
 		if (CostbenefitprojectionHelper::checkArray($columns))
 		{
-			// [7327] remove the headers you don't import/export.
+			// [7494] 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 = '')
 	{
-		// [10244] Compile the store id.
+		// [10415] 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()
 	{
-		// [10637] Get set check in time
+		// [10808] Get set check in time
 		$time = JComponentHelper::getParams('com_costbenefitprojection')->get('check_in');
 		
 		if ($time)
 		{
 
-			// [10642] Get a db connection.
+			// [10813] Get a db connection.
 			$db = JFactory::getDbo();
-			// [10644] reset query
+			// [10815] 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())
 			{
-				// [10652] Get Yesterdays date
+				// [10823] Get Yesterdays date
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// [10654] reset query
+				// [10825] reset query
 				$query = $db->getQuery(true);
 
-				// [10656] Fields to update.
+				// [10827] Fields to update.
 				$fields = array(
 					$db->quoteName('checked_out_time') . '=\'0000-00-00 00:00:00\'',
 					$db->quoteName('checked_out') . '=0'
 				);
 
-				// [10661] Conditions for which records should be updated.
+				// [10832] Conditions for which records should be updated.
 				$conditions = array(
 					$db->quoteName('checked_out') . '!=0', 
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);
 
-				// [10666] Check table
+				// [10837] 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 f4b42aab..2742d504 100644
--- a/admin/models/company.php
+++ b/admin/models/company.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		company.php
@@ -91,60 +91,60 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 
 			if (!empty($item->causesrisks))
 			{
-				// [4059] JSON Decode causesrisks.
+				// [4223] JSON Decode causesrisks.
 				$item->causesrisks = json_decode($item->causesrisks);
 			}
 
-			// [4101] Get the advanced encription key.
+			// [4265] Get the advanced encription key.
 			$advancedkey = CostbenefitprojectionHelper::getCryptKey('advanced');
-			// [4103] Get the encription object.
+			// [4267] 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)))
 			{
-				// [4109] advanced decript data medical_turnovers_males.
+				// [4273] 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)))
 			{
-				// [4109] advanced decript data sick_leave_males.
+				// [4273] 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)))
 			{
-				// [4109] advanced decript data males.
+				// [4273] 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)))
 			{
-				// [4109] advanced decript data females.
+				// [4273] 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)))
 			{
-				// [4109] advanced decript data medical_turnovers_females.
+				// [4273] 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)))
 			{
-				// [4109] advanced decript data sick_leave_females.
+				// [4273] 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)))
 			{
-				// [4109] advanced decript data total_salary.
+				// [4273] 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)))
 			{
-				// [4109] advanced decript data total_healthcare.
+				// [4273] 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->companydohg = $item->id;
-		$this->companyxiit = $item->id;
+		$this->companyfjsy = $item->id;
+		$this->companyzyqu = $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 getBqlscaling_factors()
+	public function getRxjscaling_factors()
 	{
-		// [7030] Get the user object.
+		// [7197] Get the user object.
 		$user = JFactory::getUser();
-		// [7032] Create a new query object.
+		// [7199] Create a new query object.
 		$db = JFactory::getDBO();
 		$query = $db->getQuery(true);
 
-		// [7035] Select some fields
+		// [7202] Select some fields
 		$query->select('a.*');
 
-		// [7042] From the costbenefitprojection_scaling_factor table
+		// [7209] 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
 			}
 		}
 
-		// [7635] From the costbenefitprojection_causerisk table.
+		// [7802] 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') . ')');
 
-		// [7635] From the costbenefitprojection_company table.
+		// [7802] 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') . ')');
 
-		// [7058] Filter by companydohg global.
-		$companydohg = $this->companydohg;
-		if (is_numeric($companydohg ))
+		// [7225] Filter by companyfjsy global.
+		$companyfjsy = $this->companyfjsy;
+		if (is_numeric($companyfjsy ))
 		{
-			$query->where('a.company = ' . (int) $companydohg );
+			$query->where('a.company = ' . (int) $companyfjsy );
 		}
-		elseif (is_string($companydohg))
+		elseif (is_string($companyfjsy))
 		{
-			$query->where('a.company = ' . $db->quote($companydohg));
+			$query->where('a.company = ' . $db->quote($companyfjsy));
 		}
 		else
 		{
 			$query->where('a.company = -5');
 		}
 
-		// [7090] Order the results by ordering
+		// [7257] Order the results by ordering
 		$query->order('a.ordering  ASC');
 
-		// [7092] Load the items
+		// [7259] Load the items
 		$db->setQuery($query);
 		$db->execute();
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [10696] set values to display correctly.
+			// [10867] set values to display correctly.
 			if (CostbenefitprojectionHelper::checkArray($items))
 			{
-				// [10699] get user object.
+				// [10870] 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 getYnainterventions()
+	public function getWrkinterventions()
 	{
-		// [7030] Get the user object.
+		// [7197] Get the user object.
 		$user = JFactory::getUser();
-		// [7032] Create a new query object.
+		// [7199] Create a new query object.
 		$db = JFactory::getDBO();
 		$query = $db->getQuery(true);
 
-		// [7035] Select some fields
+		// [7202] Select some fields
 		$query->select('a.*');
 
-		// [7042] From the costbenefitprojection_intervention table
+		// [7209] 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
 			}
 		}
 
-		// [7635] From the costbenefitprojection_company table.
+		// [7802] 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') . ')');
 
-		// [7058] Filter by companyxiit global.
-		$companyxiit = $this->companyxiit;
-		if (is_numeric($companyxiit ))
+		// [7225] Filter by companyzyqu global.
+		$companyzyqu = $this->companyzyqu;
+		if (is_numeric($companyzyqu ))
 		{
-			$query->where('a.company = ' . (int) $companyxiit );
+			$query->where('a.company = ' . (int) $companyzyqu );
 		}
-		elseif (is_string($companyxiit))
+		elseif (is_string($companyzyqu))
 		{
-			$query->where('a.company = ' . $db->quote($companyxiit));
+			$query->where('a.company = ' . $db->quote($companyzyqu));
 		}
 		else
 		{
 			$query->where('a.company = -5');
 		}
 
-		// [7090] Order the results by ordering
+		// [7257] Order the results by ordering
 		$query->order('a.ordering  ASC');
 
-		// [7092] Load the items
+		// [7259] Load the items
 		$db->setQuery($query);
 		$db->execute();
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [10696] set values to display correctly.
+			// [10867] set values to display correctly.
 			if (CostbenefitprojectionHelper::checkArray($items))
 			{
-				// [10699] get user object.
+				// [10870] get user object.
 				$user = JFactory::getUser();
 				foreach ($items as $nr => &$item)
 				{
@@ -345,13 +345,13 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 			}
 		} 
 
-			// [10962] set selection value to a translatable value
+			// [11133] set selection value to a translatable value
 			if (CostbenefitprojectionHelper::checkArray($items))
 			{
 				foreach ($items as $nr => &$item)
 				{
-					// [10969] convert type
-					$item->type = $this->selectionTranslationYnainterventions($item->type, 'type');
+					// [11140] convert type
+					$item->type = $this->selectionTranslationWrkinterventions($item->type, 'type');
 				}
 			}
 
@@ -365,16 +365,16 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 	*
 	* @return translatable string
 	*/
-	public function selectionTranslationYnainterventions($value,$name)
+	public function selectionTranslationWrkinterventions($value,$name)
 	{
-		// [10995] Array of type language strings
+		// [11166] Array of type language strings
 		if ($name == 'type')
 		{
 			$typeArray = array(
 				1 => 'COM_COSTBENEFITPROJECTION_INTERVENTION_SINGLE',
 				2 => 'COM_COSTBENEFITPROJECTION_INTERVENTION_CLUSTER'
 			);
-			// [11026] Now check if value is found in this array
+			// [11197] 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)
-	{		// [9651] Get the form.
+	{		// [9818] 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;
 
-		// [9736] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first.
+		// [9903] 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');
 		}
-		// [9741] The back end uses id so we use that the rest of the time and set it to 0 by default.
+		// [9908] 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();
 
-		// [9747] Check for existing item.
-		// [9748] Modify the form based on Edit State access controls.
+		// [9914] Check for existing item.
+		// [9915] 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')))
 		{
-			// [9761] Disable fields for display.
+			// [9928] Disable fields for display.
 			$form->setFieldAttribute('ordering', 'disabled', 'true');
 			$form->setFieldAttribute('published', 'disabled', 'true');
-			// [9764] Disable fields while saving.
+			// [9931] Disable fields while saving.
 			$form->setFieldAttribute('ordering', 'filter', 'unset');
 			$form->setFieldAttribute('published', 'filter', 'unset');
 		}
-		// [9769] Modify the form based on Edit Creaded By access controls.
+		// [9936] 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')))
 		{
-			// [9781] Disable fields for display.
+			// [9948] Disable fields for display.
 			$form->setFieldAttribute('created_by', 'disabled', 'true');
-			// [9783] Disable fields for display.
+			// [9950] Disable fields for display.
 			$form->setFieldAttribute('created_by', 'readonly', 'true');
-			// [9785] Disable fields while saving.
+			// [9952] Disable fields while saving.
 			$form->setFieldAttribute('created_by', 'filter', 'unset');
 		}
-		// [9788] Modify the form based on Edit Creaded Date access controls.
+		// [9955] 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')))
 		{
-			// [9800] Disable fields for display.
+			// [9967] Disable fields for display.
 			$form->setFieldAttribute('created', 'disabled', 'true');
-			// [9802] Disable fields while saving.
+			// [9969] Disable fields while saving.
 			$form->setFieldAttribute('created', 'filter', 'unset');
 		}
-		// [9810] Modify the form based on Edit Email access controls.
+		// [9977] 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')))
 		{
-			// [9814] Disable fields for display.
+			// [9981] Disable fields for display.
 			$form->setFieldAttribute('email', 'disabled', 'true');
-			// [9816] Disable fields for display.
+			// [9983] Disable fields for display.
 			$form->setFieldAttribute('email', 'readonly', 'true');
 			if (!$form->getValue('email'))
 			{
-				// [9826] Disable fields while saving.
+				// [9993] Disable fields while saving.
 				$form->setFieldAttribute('email', 'filter', 'unset');
-				// [9828] Disable fields while saving.
+				// [9995] Disable fields while saving.
 				$form->setFieldAttribute('email', 'required', 'false');
 			}
 		}
-		// [9810] Modify the form based on Edit User access controls.
+		// [9977] 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')))
 		{
-			// [9814] Disable fields for display.
+			// [9981] Disable fields for display.
 			$form->setFieldAttribute('user', 'disabled', 'true');
-			// [9816] Disable fields for display.
+			// [9983] Disable fields for display.
 			$form->setFieldAttribute('user', 'readonly', 'true');
 			if (!$form->getValue('user'))
 			{
-				// [9826] Disable fields while saving.
+				// [9993] Disable fields while saving.
 				$form->setFieldAttribute('user', 'filter', 'unset');
-				// [9828] Disable fields while saving.
+				// [9995] Disable fields while saving.
 				$form->setFieldAttribute('user', 'required', 'false');
 			}
 		}
-		// [9810] Modify the form based on Edit Department access controls.
+		// [9977] 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')))
 		{
-			// [9814] Disable fields for display.
+			// [9981] Disable fields for display.
 			$form->setFieldAttribute('department', 'disabled', 'true');
-			// [9816] Disable fields for display.
+			// [9983] Disable fields for display.
 			$form->setFieldAttribute('department', 'readonly', 'true');
-			// [9820] Disable radio button for display.
+			// [9987] Disable radio button for display.
 			$class = $form->getFieldAttribute('department', 'class', '');
 			$form->setFieldAttribute('department', 'class', $class.' disabled no-click');
 			if (!$form->getValue('department'))
 			{
-				// [9826] Disable fields while saving.
+				// [9993] Disable fields while saving.
 				$form->setFieldAttribute('department', 'filter', 'unset');
-				// [9828] Disable fields while saving.
+				// [9995] Disable fields while saving.
 				$form->setFieldAttribute('department', 'required', 'false');
 			}
 		}
-		// [9810] Modify the form based on Edit Country access controls.
+		// [9977] 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')))
 		{
-			// [9814] Disable fields for display.
+			// [9981] Disable fields for display.
 			$form->setFieldAttribute('country', 'disabled', 'true');
-			// [9816] Disable fields for display.
+			// [9983] Disable fields for display.
 			$form->setFieldAttribute('country', 'readonly', 'true');
 			if (!$form->getValue('country'))
 			{
-				// [9826] Disable fields while saving.
+				// [9993] Disable fields while saving.
 				$form->setFieldAttribute('country', 'filter', 'unset');
-				// [9828] Disable fields while saving.
+				// [9995] Disable fields while saving.
 				$form->setFieldAttribute('country', 'required', 'false');
 			}
 		}
-		// [9810] Modify the form based on Edit Serviceprovider access controls.
+		// [9977] 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')))
 		{
-			// [9814] Disable fields for display.
+			// [9981] Disable fields for display.
 			$form->setFieldAttribute('serviceprovider', 'disabled', 'true');
-			// [9816] Disable fields for display.
+			// [9983] Disable fields for display.
 			$form->setFieldAttribute('serviceprovider', 'readonly', 'true');
 			if (!$form->getValue('serviceprovider'))
 			{
-				// [9826] Disable fields while saving.
+				// [9993] Disable fields while saving.
 				$form->setFieldAttribute('serviceprovider', 'filter', 'unset');
-				// [9828] Disable fields while saving.
+				// [9995] Disable fields while saving.
 				$form->setFieldAttribute('serviceprovider', 'required', 'false');
 			}
 		}
-		// [9810] Modify the form based on Edit Per access controls.
+		// [9977] 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')))
 		{
-			// [9814] Disable fields for display.
+			// [9981] Disable fields for display.
 			$form->setFieldAttribute('per', 'disabled', 'true');
-			// [9816] Disable fields for display.
+			// [9983] Disable fields for display.
 			$form->setFieldAttribute('per', 'readonly', 'true');
-			// [9820] Disable radio button for display.
+			// [9987] Disable radio button for display.
 			$class = $form->getFieldAttribute('per', 'class', '');
 			$form->setFieldAttribute('per', 'class', $class.' disabled no-click');
 			if (!$form->getValue('per'))
 			{
-				// [9826] Disable fields while saving.
+				// [9993] Disable fields while saving.
 				$form->setFieldAttribute('per', 'filter', 'unset');
-				// [9828] Disable fields while saving.
+				// [9995] Disable fields while saving.
 				$form->setFieldAttribute('per', 'required', 'false');
 			}
 		}
-		// [9810] Modify the form based on Edit Causesrisks access controls.
+		// [9977] 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')))
 		{
-			// [9814] Disable fields for display.
+			// [9981] Disable fields for display.
 			$form->setFieldAttribute('causesrisks', 'disabled', 'true');
-			// [9816] Disable fields for display.
+			// [9983] Disable fields for display.
 			$form->setFieldAttribute('causesrisks', 'readonly', 'true');
 			if (!$form->getValue('causesrisks'))
 			{
-				// [9826] Disable fields while saving.
+				// [9993] Disable fields while saving.
 				$form->setFieldAttribute('causesrisks', 'filter', 'unset');
-				// [9828] Disable fields while saving.
+				// [9995] Disable fields while saving.
 				$form->setFieldAttribute('causesrisks', 'required', 'false');
 			}
 		}
-		// [9810] Modify the form based on Edit Percentfemale access controls.
+		// [9977] 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')))
 		{
-			// [9814] Disable fields for display.
+			// [9981] Disable fields for display.
 			$form->setFieldAttribute('percentfemale', 'disabled', 'true');
-			// [9816] Disable fields for display.
+			// [9983] Disable fields for display.
 			$form->setFieldAttribute('percentfemale', 'readonly', 'true');
-			// [9820] Disable radio button for display.
+			// [9987] Disable radio button for display.
 			$class = $form->getFieldAttribute('percentfemale', 'class', '');
 			$form->setFieldAttribute('percentfemale', 'class', $class.' disabled no-click');
 			if (!$form->getValue('percentfemale'))
 			{
-				// [9826] Disable fields while saving.
+				// [9993] Disable fields while saving.
 				$form->setFieldAttribute('percentfemale', 'filter', 'unset');
-				// [9828] Disable fields while saving.
+				// [9995] Disable fields while saving.
 				$form->setFieldAttribute('percentfemale', 'required', 'false');
 			}
 		}
-		// [9810] Modify the form based on Edit Datayear access controls.
+		// [9977] 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')))
 		{
-			// [9814] Disable fields for display.
+			// [9981] Disable fields for display.
 			$form->setFieldAttribute('datayear', 'disabled', 'true');
-			// [9816] Disable fields for display.
+			// [9983] Disable fields for display.
 			$form->setFieldAttribute('datayear', 'readonly', 'true');
 			if (!$form->getValue('datayear'))
 			{
-				// [9826] Disable fields while saving.
+				// [9993] Disable fields while saving.
 				$form->setFieldAttribute('datayear', 'filter', 'unset');
-				// [9828] Disable fields while saving.
+				// [9995] Disable fields while saving.
 				$form->setFieldAttribute('datayear', 'required', 'false');
 			}
 		}
-		// [9810] Modify the form based on Edit Percentmale access controls.
+		// [9977] 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')))
 		{
-			// [9814] Disable fields for display.
+			// [9981] Disable fields for display.
 			$form->setFieldAttribute('percentmale', 'disabled', 'true');
-			// [9816] Disable fields for display.
+			// [9983] Disable fields for display.
 			$form->setFieldAttribute('percentmale', 'readonly', 'true');
-			// [9820] Disable radio button for display.
+			// [9987] Disable radio button for display.
 			$class = $form->getFieldAttribute('percentmale', 'class', '');
 			$form->setFieldAttribute('percentmale', 'class', $class.' disabled no-click');
 			if (!$form->getValue('percentmale'))
 			{
-				// [9826] Disable fields while saving.
+				// [9993] Disable fields while saving.
 				$form->setFieldAttribute('percentmale', 'filter', 'unset');
-				// [9828] Disable fields while saving.
+				// [9995] Disable fields while saving.
 				$form->setFieldAttribute('percentmale', 'required', 'false');
 			}
 		}
@@ -654,7 +654,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 			}
 
 			$user = JFactory::getUser();
-			// [9952] The record has been set. Check the record permissions.
+			// [10119] 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)
 		{
-			// [10039] The record has been set. Check the record permissions.
+			// [10206] 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;
 			}
 		}
-		// [10056] In the absense of better information, revert to the component permissions.
+		// [10223] 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')
 	{
-		// [9864] Check specific edit permission then general edit permission.
+		// [10031] 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)
 	{
-		// [8855] check if the not_required field is set
+		// [9022] 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);
-			// [8860] now change the required field attributes value
+			// [9027] now change the required field attributes value
 			foreach ($requiredFields as $requiredField)
 			{
-				// [8863] make sure there is a string value
+				// [9030] make sure there is a string value
 				if (CostbenefitprojectionHelper::checkString($requiredField))
 				{
-					// [8866] change to false
+					// [9033] change to false
 					$form->setFieldAttribute($requiredField, 'required', 'false');
-					// [8868] also clear the data set
+					// [9035] also clear the data set
 					$data[$requiredField] = '';
 				}
 			}
@@ -976,7 +976,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 	{
 		if (empty($this->batchSet))
 		{
-			// [5015] Set some needed variables.
+			// [5179] Set some needed variables.
 			$this->user 		= JFactory::getUser();
 			$this->table 		= $this->getTable();
 			$this->tableClassName	= get_class($this->table);
@@ -1019,12 +1019,12 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 			}
 		}
 
-		// [5035] get list of uniqe fields
+		// [5199] get list of uniqe fields
 		$uniqeFields = $this->getUniqeFields();
-		// [5037] remove move_copy from array
+		// [5201] remove move_copy from array
 		unset($values['move_copy']);
 
-		// [5040] make sure published is set
+		// [5204] make sure published is set
 		if (!isset($values['published']))
 		{
 			$values['published'] = 0;
@@ -1036,21 +1036,21 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 
 		$newIds = array();
 
-		// [5077] Parent exists so let's proceed
+		// [5241] Parent exists so let's proceed
 		while (!empty($pks))
 		{
-			// [5080] Pop the first ID off the stack
+			// [5244] Pop the first ID off the stack
 			$pk = array_shift($pks);
 
 			$this->table->reset();
 
-			// [5085] only allow copy if user may edit this item.
+			// [5249] only allow copy if user may edit this item.
 
 			if (!$this->user->authorise('company.edit', $contexts[$pk]))
 
 			{
 
-				// [5095] Not fatal error
+				// [5259] Not fatal error
 
 				$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 
@@ -1058,19 +1058,19 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 
 			}
 
-			// [5100] Check that the row actually exists
+			// [5264] Check that the row actually exists
 			if (!$this->table->load($pk))
 			{
 				if ($error = $this->table->getError())
 				{
-					// [5105] Fatal error
+					// [5269] Fatal error
 					$this->setError($error);
 
 					return false;
 				}
 				else
 				{
-					// [5112] Not fatal error
+					// [5276] Not fatal error
 					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 					continue;
 				}
@@ -1078,7 +1078,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 
 			$this->table->name = $this->generateUniqe('name',$this->table->name);
 
-			// [5148] insert all set values
+			// [5312] insert all set values
 			if (CostbenefitprojectionHelper::checkArray($values))
 			{
 				foreach ($values as $key => $value)
@@ -1090,7 +1090,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 				}
 			}
 
-			// [5160] update all uniqe fields
+			// [5324] update all uniqe fields
 			if (CostbenefitprojectionHelper::checkArray($uniqeFields))
 			{
 				foreach ($uniqeFields as $uniqeField)
@@ -1099,13 +1099,13 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 				}
 			}
 
-			// [5169] Reset the ID because we are making a copy
+			// [5333] Reset the ID because we are making a copy
 			$this->table->id = 0;
 
-			// [5172] TODO: Deal with ordering?
-			// [5173] $this->table->ordering	= 1;
+			// [5336] TODO: Deal with ordering?
+			// [5337] $this->table->ordering	= 1;
 
-			// [5175] Check the row.
+			// [5339] Check the row.
 			if (!$this->table->check())
 			{
 				$this->setError($this->table->getError());
@@ -1118,7 +1118,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 				$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
 			}
 
-			// [5188] Store the row.
+			// [5352] Store the row.
 			if (!$this->table->store())
 			{
 				$this->setError($this->table->getError());
@@ -1126,14 +1126,14 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 				return false;
 			}
 
-			// [5196] Get the new item ID
+			// [5360] Get the new item ID
 			$newId = $this->table->get('id');
 
-			// [5199] Add the new ID to the array
+			// [5363] Add the new ID to the array
 			$newIds[$pk] = $newId;
 		}
 
-		// [5203] Clean the cache
+		// [5367] Clean the cache
 		$this->cleanCache();
 
 		return $newIds;
@@ -1154,7 +1154,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 	{
 		if (empty($this->batchSet))
 		{
-			// [4817] Set some needed variables.
+			// [4981] Set some needed variables.
 			$this->user		= JFactory::getUser();
 			$this->table		= $this->getTable();
 			$this->tableClassName	= get_class($this->table);
@@ -1198,15 +1198,15 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 			}
 		}
 
-		// [4839] make sure published only updates if user has the permission.
+		// [5003] make sure published only updates if user has the permission.
 		if (isset($values['published']) && !$this->canDo->get('company.edit.state'))
 		{
 			unset($values['published']);
 		}
-		// [4852] remove move_copy from array
+		// [5016] remove move_copy from array
 		unset($values['move_copy']);
 
-		// [4873] Parent exists so we proceed
+		// [5037] Parent exists so we proceed
 		foreach ($pks as $pk)
 		{
 			if (!$this->user->authorise('company.edit', $contexts[$pk]))
@@ -1216,30 +1216,30 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 				return false;
 			}
 
-			// [4890] Check that the row actually exists
+			// [5054] Check that the row actually exists
 			if (!$this->table->load($pk))
 			{
 				if ($error = $this->table->getError())
 				{
-					// [4895] Fatal error
+					// [5059] Fatal error
 					$this->setError($error);
 
 					return false;
 				}
 				else
 				{
-					// [4902] Not fatal error
+					// [5066] Not fatal error
 					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 					continue;
 				}
 			}
 
-			// [4908] insert all set values.
+			// [5072] insert all set values.
 			if (CostbenefitprojectionHelper::checkArray($values))
 			{
 				foreach ($values as $key => $value)
 				{
-					// [4913] Do special action for access.
+					// [5077] Do special action for access.
 					if ('access' == $key && strlen($value) > 0)
 					{
 						$this->table->$key = $value;
@@ -1252,7 +1252,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 			}
 
 
-			// [4925] Check the row.
+			// [5089] Check the row.
 			if (!$this->table->check())
 			{
 				$this->setError($this->table->getError());
@@ -1265,7 +1265,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 				$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
 			}
 
-			// [4938] Store the row.
+			// [5102] Store the row.
 			if (!$this->table->store())
 			{
 				$this->setError($this->table->getError());
@@ -1274,7 +1274,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 			}
 		}
 
-		// [4947] Clean the cache
+		// [5111] Clean the cache
 		$this->cleanCache();
 
 		return true;
@@ -1304,60 +1304,60 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 			$data['metadata'] = (string) $metadata;
 		} 
 
-		// [4169] Set the causesrisks string to JSON string.
+		// [4333] Set the causesrisks string to JSON string.
 		if (isset($data['causesrisks']))
 		{
 			$data['causesrisks'] = (string) json_encode($data['causesrisks']);
 		}
 
-		// [4209] Get the advanced encription key.
+		// [4373] Get the advanced encription key.
 		$advancedkey = CostbenefitprojectionHelper::getCryptKey('advanced');
-		// [4211] Get the encription object
+		// [4375] Get the encription object
 		$advanced = new FOFEncryptAes($advancedkey, 256);
 
-		// [4215] Encript data medical_turnovers_males.
+		// [4379] Encript data medical_turnovers_males.
 		if (isset($data['medical_turnovers_males']) && $advancedkey)
 		{
 			$data['medical_turnovers_males'] = $advanced->encryptString($data['medical_turnovers_males']);
 		}
 
-		// [4215] Encript data sick_leave_males.
+		// [4379] Encript data sick_leave_males.
 		if (isset($data['sick_leave_males']) && $advancedkey)
 		{
 			$data['sick_leave_males'] = $advanced->encryptString($data['sick_leave_males']);
 		}
 
-		// [4215] Encript data males.
+		// [4379] Encript data males.
 		if (isset($data['males']) && $advancedkey)
 		{
 			$data['males'] = $advanced->encryptString($data['males']);
 		}
 
-		// [4215] Encript data females.
+		// [4379] Encript data females.
 		if (isset($data['females']) && $advancedkey)
 		{
 			$data['females'] = $advanced->encryptString($data['females']);
 		}
 
-		// [4215] Encript data medical_turnovers_females.
+		// [4379] Encript data medical_turnovers_females.
 		if (isset($data['medical_turnovers_females']) && $advancedkey)
 		{
 			$data['medical_turnovers_females'] = $advanced->encryptString($data['medical_turnovers_females']);
 		}
 
-		// [4215] Encript data sick_leave_females.
+		// [4379] Encript data sick_leave_females.
 		if (isset($data['sick_leave_females']) && $advancedkey)
 		{
 			$data['sick_leave_females'] = $advanced->encryptString($data['sick_leave_females']);
 		}
 
-		// [4215] Encript data total_salary.
+		// [4379] Encript data total_salary.
 		if (isset($data['total_salary']) && $advancedkey)
 		{
 			$data['total_salary'] = $advanced->encryptString($data['total_salary']);
 		}
 
-		// [4215] Encript data total_healthcare.
+		// [4379] Encript data total_healthcare.
 		if (isset($data['total_healthcare']) && $advancedkey)
 		{
 			$data['total_healthcare'] = $advanced->encryptString($data['total_healthcare']);
@@ -1378,10 +1378,10 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 			$data['params'] = (string) $params;
 		}
 
-		// [5295] Alter the uniqe field for save as copy
+		// [5459] Alter the uniqe field for save as copy
 		if ($input->get('task') == 'save2copy')
 		{
-			// [5298] Automatic handling of other uniqe fields
+			// [5462] Automatic handling of other uniqe fields
 			$uniqeFields = $this->getUniqeFields();
 			if (CostbenefitprojectionHelper::checkArray($uniqeFields))
 			{
@@ -1434,7 +1434,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 	protected function _generateNewTitle($title)
 	{
 
-		// [5353] Alter the title
+		// [5517] 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 8f08cb85..80b63ab1 100644
--- a/admin/models/companyresults.php
+++ b/admin/models/companyresults.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		companyresults.php
@@ -133,123 +133,123 @@ class CostbenefitprojectionModelCompanyresults extends JModelItem
 			try
 			{
 
-				// [2464] Get the advanced encription.
+				// [2545] Get the advanced encription.
 				$advancedkey = CostbenefitprojectionHelper::getCryptKey('advanced');
-				// [2466] Get the encription object.
+				// [2547] Get the encription object.
 				$advanced = new FOFEncryptAes($advancedkey, 256);
-				// [2370] Get a db connection.
+				// [2451] Get a db connection.
 				$db = JFactory::getDbo();
 
-				// [2372] Create a new query object.
+				// [2453] Create a new query object.
 				$query = $db->getQuery(true);
 
-				// [1820] Get from #__costbenefitprojection_company as a
+				// [1901] Get from #__costbenefitprojection_company as a
 				$query->select($db->quoteName(
 			array('a.id','a.name','a.user','a.department','a.per','a.country','a.serviceprovider','a.datayear','a.working_days','a.total_salary','a.total_healthcare','a.productivity_losses','a.males','a.females','a.medical_turnovers_males','a.medical_turnovers_females','a.sick_leave_males','a.sick_leave_females','a.percentmale','a.percentfemale','a.causesrisks','a.published','a.access'),
 			array('id','name','user','department','per','country','serviceprovider','datayear','working_days','total_salary','total_healthcare','productivity_losses','males','females','medical_turnovers_males','medical_turnovers_females','sick_leave_males','sick_leave_females','percentmale','percentfemale','causesrisks','published','access')));
 				$query->from($db->quoteName('#__costbenefitprojection_company', 'a'));
 
-				// [1820] Get from #__costbenefitprojection_country as e
+				// [1901] Get from #__costbenefitprojection_country as e
 				$query->select($db->quoteName(
 			array('e.id','e.name','e.alias','e.user','e.currency','e.datayear','e.worldzone','e.codethree','e.codetwo','e.working_days','e.presenteeism','e.medical_turnovers','e.sick_leave','e.healthcare','e.productivity_losses','e.publicname','e.publicemail','e.publicnumber','e.publicaddress','e.percentmale','e.percentfemale','e.causesrisks','e.maledeath','e.femaledeath','e.maleyld','e.femaleyld','e.access'),
 			array('country_id','country_name','country_alias','country_user','country_currency','country_datayear','country_worldzone','country_codethree','country_codetwo','country_working_days','country_presenteeism','country_medical_turnovers','country_sick_leave','country_healthcare','country_productivity_losses','country_publicname','country_publicemail','country_publicnumber','country_publicaddress','country_percentmale','country_percentfemale','country_causesrisks','country_maledeath','country_femaledeath','country_maleyld','country_femaleyld','country_access')));
 				$query->join('LEFT', ($db->quoteName('#__costbenefitprojection_country', 'e')) . ' ON (' . $db->quoteName('a.country') . ' = ' . $db->quoteName('e.id') . ')');
 
-				// [1820] Get from #__costbenefitprojection_currency as f
+				// [1901] Get from #__costbenefitprojection_currency as f
 				$query->select($db->quoteName(
 			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') . ')');
 				$query->where('a.id = ' . (int) $pk);
 
-				// [2383] Reset the query using our newly populated query object.
+				// [2464] Reset the query using our newly populated query object.
 				$db->setQuery($query);
-				// [2385] Load the results as a stdClass object.
+				// [2466] Load the results as a stdClass object.
 				$data = $db->loadObject();
 
 				if (empty($data))
 				{
-					// [2396] If no data is found redirect to default page and show warning.
+					// [2477] 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)))
 				{
-					// [2022] Decode medical_turnovers_males
+					// [2103] 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)))
 				{
-					// [2022] Decode sick_leave_males
+					// [2103] 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)))
 				{
-					// [2022] Decode males
+					// [2103] Decode males
 					$data->males = rtrim($advanced->decryptString($data->males), "\0");
 				}
 				if (CostbenefitprojectionHelper::checkString($data->causesrisks))
 				{
-					// [2022] Decode causesrisks
+					// [2103] 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)))
 				{
-					// [2022] Decode females
+					// [2103] 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)))
 				{
-					// [2022] Decode medical_turnovers_females
+					// [2103] 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)))
 				{
-					// [2022] Decode sick_leave_females
+					// [2103] 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)))
 				{
-					// [2022] Decode total_salary
+					// [2103] 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)))
 				{
-					// [2022] Decode total_healthcare
+					// [2103] Decode total_healthcare
 					$data->total_healthcare = rtrim($advanced->decryptString($data->total_healthcare), "\0");
 				}
 				if (CostbenefitprojectionHelper::checkString($data->country_causesrisks))
 				{
-					// [2022] Decode country_causesrisks
+					// [2103] Decode country_causesrisks
 					$data->country_causesrisks = json_decode($data->country_causesrisks, true);
 				}
-				// [2037] Make sure the content prepare plugins fire on country_publicaddress.
+				// [2118] Make sure the content prepare plugins fire on country_publicaddress.
 				$data->country_publicaddress = JHtml::_('content.prepare',$data->country_publicaddress);
-				// [2039] Checking if country_publicaddress has uikit components that must be loaded.
+				// [2120] Checking if country_publicaddress has uikit components that must be loaded.
 				$this->uikitComp = CostbenefitprojectionHelper::getUikitComp($data->country_publicaddress,$this->uikitComp);
-				// [2342] set the global causesrisks value.
+				// [2423] set the global causesrisks value.
 				$this->a_causesrisks = $data->causesrisks;
-				// [2342] set the global datayear value.
+				// [2423] set the global datayear value.
 				$this->a_datayear = $data->datayear;
-				// [2342] set the global datayear value.
+				// [2423] set the global datayear value.
 				$this->e_datayear = $data->country_datayear;
-				// [2342] set the global causesrisks value.
+				// [2423] set the global causesrisks value.
 				$this->e_causesrisks = $data->country_causesrisks;
-				// [2070] set countryCountryHealth_dataB to the $data object.
+				// [2151] set countryCountryHealth_dataB to the $data object.
 				$data->countryCountryHealth_dataB = $this->getCountryCountryHealth_dataEbbe_B($data->country);
-				// [2070] set idCompanyScaling_factorC to the $data object.
+				// [2151] set idCompanyScaling_factorC to the $data object.
 				$data->idCompanyScaling_factorC = $this->getIdCompanyScaling_factorEbbe_C($data->id);
-				// [2070] set idCompanyInterventionD to the $data object.
+				// [2151] set idCompanyInterventionD to the $data object.
 				$data->idCompanyInterventionD = $this->getIdCompanyInterventionEbbe_D($data->id);
-				// [2070] set causesrisksIdCauseriskG to the $data object.
+				// [2151] set causesrisksIdCauseriskG to the $data object.
 				$data->causesrisksIdCauseriskG = $this->getCausesrisksIdCauseriskEbbe_G($data->causesrisks);
-				// [2070] set countryCountryHealth_dataBB to the $data object.
+				// [2151] set countryCountryHealth_dataBB to the $data object.
 				$data->countryCountryHealth_dataBB = $this->getCountryCountryHealth_dataEbbe_BB($data->country);
-				// [2070] set causesrisksIdCauseriskGG to the $data object.
+				// [2151] set causesrisksIdCauseriskGG to the $data object.
 				$data->causesrisksIdCauseriskGG = $this->getCausesrisksIdCauseriskEbbe_GG($data->country_causesrisks);
 
-				// [2490] set data object to item.
+				// [2571] 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)
 	{
-		// [2750] Get a db connection.
+		// [2831] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2752] Create a new query object.
+		// [2833] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2754] Get from #__costbenefitprojection_health_data as b
+		// [2835] 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));
-				// [2152] Check if $this->a_causesrisks is an array with values.
+				// [2233] 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');
 
-		// [2808] Reset the query using our newly populated query object.
+		// [2889] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2811] check if there was data returned
+		// [2892] 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)
 	{
-		// [2750] Get a db connection.
+		// [2831] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2752] Create a new query object.
+		// [2833] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2754] Get from #__costbenefitprojection_scaling_factor as c
+		// [2835] 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');
 
-		// [2808] Reset the query using our newly populated query object.
+		// [2889] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2811] check if there was data returned
+		// [2892] check if there was data returned
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [2864] Convert the parameter fields into objects.
+			// [2945] Convert the parameter fields into objects.
 			foreach ($items as $nr => &$item)
 			{
-				// [2037] Make sure the content prepare plugins fire on reference.
+				// [2118] Make sure the content prepare plugins fire on reference.
 				$item->reference = JHtml::_('content.prepare',$item->reference);
-				// [2039] Checking if reference has uikit components that must be loaded.
+				// [2120] 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)
 	{
-		// [2750] Get a db connection.
+		// [2831] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2752] Create a new query object.
+		// [2833] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2754] Get from #__costbenefitprojection_intervention as d
+		// [2835] 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');
 
-		// [2808] Reset the query using our newly populated query object.
+		// [2889] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2811] check if there was data returned
+		// [2892] check if there was data returned
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [2864] Convert the parameter fields into objects.
+			// [2945] Convert the parameter fields into objects.
 			foreach ($items as $nr => &$item)
 			{
-				// [2037] Make sure the content prepare plugins fire on description.
+				// [2118] Make sure the content prepare plugins fire on description.
 				$item->description = JHtml::_('content.prepare',$item->description);
-				// [2039] Checking if description has uikit components that must be loaded.
+				// [2120] Checking if description has uikit components that must be loaded.
 				$this->uikitComp = CostbenefitprojectionHelper::getUikitComp($item->description,$this->uikitComp);
-				// [2037] Make sure the content prepare plugins fire on reference.
+				// [2118] Make sure the content prepare plugins fire on reference.
 				$item->reference = JHtml::_('content.prepare',$item->reference);
-				// [2039] Checking if reference has uikit components that must be loaded.
+				// [2120] 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)
 	{
-		// [2750] Get a db connection.
+		// [2831] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2752] Create a new query object.
+		// [2833] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2754] Get from #__costbenefitprojection_causerisk as g
+		// [2835] 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'));
 
-		// [2760] Check if $causesrisks is an array with values.
+		// [2841] 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;
 		}
 
-		// [2808] Reset the query using our newly populated query object.
+		// [2889] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2811] check if there was data returned
+		// [2892] check if there was data returned
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [2864] Convert the parameter fields into objects.
+			// [2945] Convert the parameter fields into objects.
 			foreach ($items as $nr => &$item)
 			{
-				// [2037] Make sure the content prepare plugins fire on description.
+				// [2118] Make sure the content prepare plugins fire on description.
 				$item->description = JHtml::_('content.prepare',$item->description);
-				// [2039] Checking if description has uikit components that must be loaded.
+				// [2120] 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)
 	{
-		// [2750] Get a db connection.
+		// [2831] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2752] Create a new query object.
+		// [2833] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2754] Get from #__costbenefitprojection_health_data as bb
+		// [2835] 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));
-				// [2152] Check if $this->e_causesrisks is an array with values.
+				// [2233] 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');
 
-		// [2808] Reset the query using our newly populated query object.
+		// [2889] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2811] check if there was data returned
+		// [2892] 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)
 	{
-		// [2750] Get a db connection.
+		// [2831] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2752] Create a new query object.
+		// [2833] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2754] Get from #__costbenefitprojection_causerisk as gg
+		// [2835] 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'));
 
-		// [2760] Check if $causesrisks is an array with values.
+		// [2841] 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;
 		}
 
-		// [2808] Reset the query using our newly populated query object.
+		// [2889] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2811] check if there was data returned
+		// [2892] check if there was data returned
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [2864] Convert the parameter fields into objects.
+			// [2945] Convert the parameter fields into objects.
 			foreach ($items as $nr => &$item)
 			{
-				// [2037] Make sure the content prepare plugins fire on description.
+				// [2118] Make sure the content prepare plugins fire on description.
 				$item->description = JHtml::_('content.prepare',$item->description);
-				// [2039] Checking if description has uikit components that must be loaded.
+				// [2120] 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 b2048e95..d7316040 100644
--- a/admin/models/costbenefitprojection.php
+++ b/admin/models/costbenefitprojection.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		costbenefitprojection.php
@@ -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')
 		);
-		// [12267] view access array
+		// [12438] 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 b0c847d6..ca789a0c 100644
--- a/admin/models/countries.php
+++ b/admin/models/countries.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		countries.php
@@ -111,16 +111,16 @@ class CostbenefitprojectionModelCountries extends JModelList
 	 */
 	public function getItems()
 	{ 
-		// [10621] check in items
+		// [10792] check in items
 		$this->checkInNow();
 
 		// load parent items
 		$items = parent::getItems();
 
-		// [10696] set values to display correctly.
+		// [10867] set values to display correctly.
 		if (CostbenefitprojectionHelper::checkArray($items))
 		{
-			// [10699] get user object.
+			// [10870] get user object.
 			$user = JFactory::getUser();
 			foreach ($items as $nr => &$item)
 			{
@@ -145,16 +145,16 @@ class CostbenefitprojectionModelCountries extends JModelList
 	 */
 	protected function getListQuery()
 	{
-		// [7482] Get the user object.
+		// [7649] Get the user object.
 		$user = JFactory::getUser();
-		// [7484] Create a new query object.
+		// [7651] Create a new query object.
 		$db = JFactory::getDBO();
 		$query = $db->getQuery(true);
 
-		// [7487] Select some fields
+		// [7654] Select some fields
 		$query->select('a.*');
 
-		// [7494] From the costbenefitprojection_item table
+		// [7661] 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
 			}
 		}
 
-		// [7635] From the users table.
+		// [7802] 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') . ')');
 
-		// [7635] From the costbenefitprojection_currency table.
+		// [7802] 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') . ')');
 
-		// [7508] Filter by published state
+		// [7675] 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)');
 		}
 
-		// [7520] Join over the asset groups.
+		// [7687] Join over the asset groups.
 		$query->select('ag.title AS access_level');
 		$query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
-		// [7523] Filter by access level.
+		// [7690] Filter by access level.
 		if ($access = $this->getState('filter.access'))
 		{
 			$query->where('a.access = ' . (int) $access);
 		}
-		// [7528] Implement View Level Access
+		// [7695] Implement View Level Access
 		if (!$user->authorise('core.options', 'com_costbenefitprojection'))
 		{
 			$groups = implode(',', $user->getAuthorisedViewLevels());
 			$query->where('a.access IN (' . $groups . ')');
 		}
-		// [7605] Filter by search.
+		// [7772] Filter by search.
 		$search = $this->getState('filter.search');
 		if (!empty($search))
 		{
@@ -221,13 +221,13 @@ class CostbenefitprojectionModelCountries extends JModelList
 			}
 		}
 
-		// [7839] Filter by currency.
+		// [8006] Filter by currency.
 		if ($currency = $this->getState('filter.currency'))
 		{
 			$query->where('a.currency = ' . $db->quote($db->escape($currency, true)));
 		}
 
-		// [7564] Add the list ordering clause.
+		// [7731] 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)
 	{
-		// [7272] setup the query
+		// [7439] setup the query
 		if (CostbenefitprojectionHelper::checkArray($pks))
 		{
-			// [7275] Get the user object.
+			// [7442] Get the user object.
 			$user = JFactory::getUser();
-			// [7277] Create a new query object.
+			// [7444] Create a new query object.
 			$db = JFactory::getDBO();
 			$query = $db->getQuery(true);
 
-			// [7280] Select some fields
+			// [7447] Select some fields
 			$query->select('a.*');
 
-			// [7282] From the costbenefitprojection_country table
+			// [7449] 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');
 			}
 		}
-			// [7292] Implement View Level Access
+			// [7459] Implement View Level Access
 			if (!$user->authorise('core.options', 'com_costbenefitprojection'))
 			{
 				$groups = implode(',', $user->getAuthorisedViewLevels());
 				$query->where('a.access IN (' . $groups . ')');
 			}
 
-			// [7299] Order the results by ordering
+			// [7466] Order the results by ordering
 			$query->order('a.ordering  ASC');
 
-			// [7301] Load the items
+			// [7468] Load the items
 			$db->setQuery($query);
 			$db->execute();
 			if ($db->getNumRows())
 			{
 				$items = $db->loadObjectList();
 
-				// [10696] set values to display correctly.
+				// [10867] set values to display correctly.
 				if (CostbenefitprojectionHelper::checkArray($items))
 				{
-					// [10699] get user object.
+					// [10870] get user object.
 					$user = JFactory::getUser();
 					foreach ($items as $nr => &$item)
 					{
@@ -307,13 +307,13 @@ class CostbenefitprojectionModelCountries extends JModelList
 							continue;
 						}
 
-						// [10909] unset the values we don't want exported.
+						// [11080] unset the values we don't want exported.
 						unset($item->asset_id);
 						unset($item->checked_out);
 						unset($item->checked_out_time);
 					}
 				}
-				// [10918] Add headers to items array.
+				// [11089] Add headers to items array.
 				$headers = $this->getExImPortHeaders();
 				if (CostbenefitprojectionHelper::checkObject($headers))
 				{
@@ -332,13 +332,13 @@ class CostbenefitprojectionModelCountries extends JModelList
 	*/
 	public function getExImPortHeaders()
 	{
-		// [7321] Get a db connection.
+		// [7488] Get a db connection.
 		$db = JFactory::getDbo();
-		// [7323] get the columns
+		// [7490] get the columns
 		$columns = $db->getTableColumns("#__costbenefitprojection_country");
 		if (CostbenefitprojectionHelper::checkArray($columns))
 		{
-			// [7327] remove the headers you don't import/export.
+			// [7494] 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 = '')
 	{
-		// [10244] Compile the store id.
+		// [10415] 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()
 	{
-		// [10637] Get set check in time
+		// [10808] Get set check in time
 		$time = JComponentHelper::getParams('com_costbenefitprojection')->get('check_in');
 		
 		if ($time)
 		{
 
-			// [10642] Get a db connection.
+			// [10813] Get a db connection.
 			$db = JFactory::getDbo();
-			// [10644] reset query
+			// [10815] 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())
 			{
-				// [10652] Get Yesterdays date
+				// [10823] Get Yesterdays date
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// [10654] reset query
+				// [10825] reset query
 				$query = $db->getQuery(true);
 
-				// [10656] Fields to update.
+				// [10827] Fields to update.
 				$fields = array(
 					$db->quoteName('checked_out_time') . '=\'0000-00-00 00:00:00\'',
 					$db->quoteName('checked_out') . '=0'
 				);
 
-				// [10661] Conditions for which records should be updated.
+				// [10832] Conditions for which records should be updated.
 				$conditions = array(
 					$db->quoteName('checked_out') . '!=0', 
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);
 
-				// [10666] Check table
+				// [10837] 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 e4d7d49b..d202c8df 100644
--- a/admin/models/country.php
+++ b/admin/models/country.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		country.php
@@ -91,7 +91,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 
 			if (!empty($item->causesrisks))
 			{
-				// [4059] JSON Decode causesrisks.
+				// [4223] 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->countryoxci = $item->id;
-		$this->countrykeau = $item->id;
+		$this->countryiuwf = $item->id;
+		$this->countryxnwk = $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 getXrcservice_providers()
+	public function getZrcservice_providers()
 	{
-		// [7030] Get the user object.
+		// [7197] Get the user object.
 		$user = JFactory::getUser();
-		// [7032] Create a new query object.
+		// [7199] Create a new query object.
 		$db = JFactory::getDBO();
 		$query = $db->getQuery(true);
 
-		// [7035] Select some fields
+		// [7202] Select some fields
 		$query->select('a.*');
 
-		// [7042] From the costbenefitprojection_service_provider table
+		// [7209] 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
 			}
 		}
 
-		// [7635] From the users table.
+		// [7802] 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') . ')');
 
-		// [7635] From the costbenefitprojection_country table.
+		// [7802] 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') . ')');
 
-		// [7058] Filter by countryoxci global.
-		$countryoxci = $this->countryoxci;
-		if (is_numeric($countryoxci ))
+		// [7225] Filter by countryiuwf global.
+		$countryiuwf = $this->countryiuwf;
+		if (is_numeric($countryiuwf ))
 		{
-			$query->where('a.country = ' . (int) $countryoxci );
+			$query->where('a.country = ' . (int) $countryiuwf );
 		}
-		elseif (is_string($countryoxci))
+		elseif (is_string($countryiuwf))
 		{
-			$query->where('a.country = ' . $db->quote($countryoxci));
+			$query->where('a.country = ' . $db->quote($countryiuwf));
 		}
 		else
 		{
 			$query->where('a.country = -5');
 		}
 
-		// [7090] Order the results by ordering
+		// [7257] Order the results by ordering
 		$query->order('a.ordering  ASC');
 
-		// [7092] Load the items
+		// [7259] Load the items
 		$db->setQuery($query);
 		$db->execute();
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [10696] set values to display correctly.
+			// [10867] set values to display correctly.
 			if (CostbenefitprojectionHelper::checkArray($items))
 			{
-				// [10699] get user object.
+				// [10870] 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 getTnpcompanies()
+	public function getMyzcompanies()
 	{
-		// [7030] Get the user object.
+		// [7197] Get the user object.
 		$user = JFactory::getUser();
-		// [7032] Create a new query object.
+		// [7199] Create a new query object.
 		$db = JFactory::getDBO();
 		$query = $db->getQuery(true);
 
-		// [7035] Select some fields
+		// [7202] Select some fields
 		$query->select('a.*');
 
-		// [7042] From the costbenefitprojection_company table
+		// [7209] 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
 			}
 		}
 
-		// [7635] From the users table.
+		// [7802] 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') . ')');
 
-		// [7635] From the costbenefitprojection_country table.
+		// [7802] 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') . ')');
 
-		// [7635] From the costbenefitprojection_service_provider table.
+		// [7802] 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') . ')');
 
-		// [7058] Filter by countrykeau global.
-		$countrykeau = $this->countrykeau;
-		if (is_numeric($countrykeau ))
+		// [7225] Filter by countryxnwk global.
+		$countryxnwk = $this->countryxnwk;
+		if (is_numeric($countryxnwk ))
 		{
-			$query->where('a.country = ' . (int) $countrykeau );
+			$query->where('a.country = ' . (int) $countryxnwk );
 		}
-		elseif (is_string($countrykeau))
+		elseif (is_string($countryxnwk))
 		{
-			$query->where('a.country = ' . $db->quote($countrykeau));
+			$query->where('a.country = ' . $db->quote($countryxnwk));
 		}
 		else
 		{
 			$query->where('a.country = -5');
 		}
 
-		// [7075] Join over the asset groups.
+		// [7242] Join over the asset groups.
 		$query->select('ag.title AS access_level');
 		$query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
-		// [7078] Filter by access level.
+		// [7245] Filter by access level.
 		if ($access = $this->getState('filter.access'))
 		{
 			$query->where('a.access = ' . (int) $access);
 		}
-		// [7083] Implement View Level Access
+		// [7250] Implement View Level Access
 		if (!$user->authorise('core.options', 'com_costbenefitprojection'))
 		{
 			$groups = implode(',', $user->getAuthorisedViewLevels());
 			$query->where('a.access IN (' . $groups . ')');
 		}
 
-		// [7090] Order the results by ordering
+		// [7257] Order the results by ordering
 		$query->order('a.ordering  ASC');
 
-		// [7092] Load the items
+		// [7259] Load the items
 		$db->setQuery($query);
 		$db->execute();
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [10696] set values to display correctly.
+			// [10867] set values to display correctly.
 			if (CostbenefitprojectionHelper::checkArray($items))
 			{
-				// [10699] get user object.
+				// [10870] get user object.
 				$user = JFactory::getUser();
 				foreach ($items as $nr => &$item)
 				{
@@ -302,15 +302,15 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 				}
 			}
 
-			// [10962] set selection value to a translatable value
+			// [11133] set selection value to a translatable value
 			if (CostbenefitprojectionHelper::checkArray($items))
 			{
 				foreach ($items as $nr => &$item)
 				{
-					// [10969] convert department
-					$item->department = $this->selectionTranslationTnpcompanies($item->department, 'department');
-					// [10969] convert per
-					$item->per = $this->selectionTranslationTnpcompanies($item->per, 'per');
+					// [11140] convert department
+					$item->department = $this->selectionTranslationMyzcompanies($item->department, 'department');
+					// [11140] convert per
+					$item->per = $this->selectionTranslationMyzcompanies($item->per, 'per');
 				}
 			}
 
@@ -324,29 +324,29 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 	*
 	* @return translatable string
 	*/
-	public function selectionTranslationTnpcompanies($value,$name)
+	public function selectionTranslationMyzcompanies($value,$name)
 	{
-		// [10995] Array of department language strings
+		// [11166] Array of department language strings
 		if ($name == 'department')
 		{
 			$departmentArray = array(
 				1 => 'COM_COSTBENEFITPROJECTION_COMPANY_BASIC',
 				2 => 'COM_COSTBENEFITPROJECTION_COMPANY_ADVANCED'
 			);
-			// [11026] Now check if value is found in this array
+			// [11197] Now check if value is found in this array
 			if (isset($departmentArray[$value]) && CostbenefitprojectionHelper::checkString($departmentArray[$value]))
 			{
 				return $departmentArray[$value];
 			}
 		}
-		// [10995] Array of per language strings
+		// [11166] Array of per language strings
 		if ($name == 'per')
 		{
 			$perArray = array(
 				1 => 'COM_COSTBENEFITPROJECTION_COMPANY_OPEN',
 				0 => 'COM_COSTBENEFITPROJECTION_COMPANY_LOCKED'
 			);
-			// [11026] Now check if value is found in this array
+			// [11197] 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)
-	{		// [9651] Get the form.
+	{		// [9818] 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;
 
-		// [9736] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first.
+		// [9903] 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');
 		}
-		// [9741] The back end uses id so we use that the rest of the time and set it to 0 by default.
+		// [9908] 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();
 
-		// [9747] Check for existing item.
-		// [9748] Modify the form based on Edit State access controls.
+		// [9914] Check for existing item.
+		// [9915] 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')))
 		{
-			// [9761] Disable fields for display.
+			// [9928] Disable fields for display.
 			$form->setFieldAttribute('ordering', 'disabled', 'true');
 			$form->setFieldAttribute('published', 'disabled', 'true');
-			// [9764] Disable fields while saving.
+			// [9931] Disable fields while saving.
 			$form->setFieldAttribute('ordering', 'filter', 'unset');
 			$form->setFieldAttribute('published', 'filter', 'unset');
 		}
-		// [9769] Modify the form based on Edit Creaded By access controls.
+		// [9936] Modify the form based on Edit Creaded By access controls.
 		if (!$user->authorise('core.edit.created_by', 'com_costbenefitprojection'))
 		{
-			// [9781] Disable fields for display.
+			// [9948] Disable fields for display.
 			$form->setFieldAttribute('created_by', 'disabled', 'true');
-			// [9783] Disable fields for display.
+			// [9950] Disable fields for display.
 			$form->setFieldAttribute('created_by', 'readonly', 'true');
-			// [9785] Disable fields while saving.
+			// [9952] Disable fields while saving.
 			$form->setFieldAttribute('created_by', 'filter', 'unset');
 		}
-		// [9788] Modify the form based on Edit Creaded Date access controls.
+		// [9955] Modify the form based on Edit Creaded Date access controls.
 		if (!$user->authorise('core.edit.created', 'com_costbenefitprojection'))
 		{
-			// [9800] Disable fields for display.
+			// [9967] Disable fields for display.
 			$form->setFieldAttribute('created', 'disabled', 'true');
-			// [9802] Disable fields while saving.
+			// [9969] Disable fields while saving.
 			$form->setFieldAttribute('created', 'filter', 'unset');
 		}
 
@@ -452,7 +452,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 			}
 
 			$user = JFactory::getUser();
-			// [9952] The record has been set. Check the record permissions.
+			// [10119] 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)
 		{
-			// [10039] The record has been set. Check the record permissions.
+			// [10206] 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;
 			}
 		}
-		// [10056] In the absense of better information, revert to the component permissions.
+		// [10223] 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')
 	{
-		// [9864] Check specific edit permission then general edit permission.
+		// [10031] 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'))
@@ -732,7 +732,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 	{
 		if (empty($this->batchSet))
 		{
-			// [5015] Set some needed variables.
+			// [5179] Set some needed variables.
 			$this->user 		= JFactory::getUser();
 			$this->table 		= $this->getTable();
 			$this->tableClassName	= get_class($this->table);
@@ -777,12 +777,12 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 		}
 
 
-		// [5035] get list of uniqe fields
+		// [5199] get list of uniqe fields
 		$uniqeFields = $this->getUniqeFields();
-		// [5037] remove move_copy from array
+		// [5201] remove move_copy from array
 		unset($values['move_copy']);
 
-		// [5040] make sure published is set
+		// [5204] make sure published is set
 		if (!isset($values['published']))
 		{
 			$values['published'] = 0;
@@ -794,21 +794,21 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 
 		$newIds = array();
 
-		// [5077] Parent exists so let's proceed
+		// [5241] Parent exists so let's proceed
 		while (!empty($pks))
 		{
-			// [5080] Pop the first ID off the stack
+			// [5244] Pop the first ID off the stack
 			$pk = array_shift($pks);
 
 			$this->table->reset();
 
-			// [5085] only allow copy if user may edit this item.
+			// [5249] only allow copy if user may edit this item.
 
 			if (!$this->user->authorise('country.edit', $contexts[$pk]))
 
 			{
 
-				// [5095] Not fatal error
+				// [5259] Not fatal error
 
 				$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 
@@ -816,19 +816,19 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 
 			}
 
-			// [5100] Check that the row actually exists
+			// [5264] Check that the row actually exists
 			if (!$this->table->load($pk))
 			{
 				if ($error = $this->table->getError())
 				{
-					// [5105] Fatal error
+					// [5269] Fatal error
 					$this->setError($error);
 
 					return false;
 				}
 				else
 				{
-					// [5112] Not fatal error
+					// [5276] Not fatal error
 					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 					continue;
 				}
@@ -836,7 +836,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 
 			list($this->table->name, $this->table->alias) = $this->_generateNewTitle($this->table->alias, $this->table->name);
 
-			// [5148] insert all set values
+			// [5312] insert all set values
 			if (CostbenefitprojectionHelper::checkArray($values))
 			{
 				foreach ($values as $key => $value)
@@ -848,7 +848,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 				}
 			}
 
-			// [5160] update all uniqe fields
+			// [5324] update all uniqe fields
 			if (CostbenefitprojectionHelper::checkArray($uniqeFields))
 			{
 				foreach ($uniqeFields as $uniqeField)
@@ -857,13 +857,13 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 				}
 			}
 
-			// [5169] Reset the ID because we are making a copy
+			// [5333] Reset the ID because we are making a copy
 			$this->table->id = 0;
 
-			// [5172] TODO: Deal with ordering?
-			// [5173] $this->table->ordering	= 1;
+			// [5336] TODO: Deal with ordering?
+			// [5337] $this->table->ordering	= 1;
 
-			// [5175] Check the row.
+			// [5339] Check the row.
 			if (!$this->table->check())
 			{
 				$this->setError($this->table->getError());
@@ -876,7 +876,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 				$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
 			}
 
-			// [5188] Store the row.
+			// [5352] Store the row.
 			if (!$this->table->store())
 			{
 				$this->setError($this->table->getError());
@@ -884,14 +884,14 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 				return false;
 			}
 
-			// [5196] Get the new item ID
+			// [5360] Get the new item ID
 			$newId = $this->table->get('id');
 
-			// [5199] Add the new ID to the array
+			// [5363] Add the new ID to the array
 			$newIds[$pk] = $newId;
 		}
 
-		// [5203] Clean the cache
+		// [5367] Clean the cache
 		$this->cleanCache();
 
 		return $newIds;
@@ -912,7 +912,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 	{
 		if (empty($this->batchSet))
 		{
-			// [4817] Set some needed variables.
+			// [4981] Set some needed variables.
 			$this->user		= JFactory::getUser();
 			$this->table		= $this->getTable();
 			$this->tableClassName	= get_class($this->table);
@@ -958,15 +958,15 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 		}
 
 
-		// [4839] make sure published only updates if user has the permission.
+		// [5003] make sure published only updates if user has the permission.
 		if (isset($values['published']) && !$this->canDo->get('country.edit.state'))
 		{
 			unset($values['published']);
 		}
-		// [4852] remove move_copy from array
+		// [5016] remove move_copy from array
 		unset($values['move_copy']);
 
-		// [4873] Parent exists so we proceed
+		// [5037] Parent exists so we proceed
 		foreach ($pks as $pk)
 		{
 			if (!$this->user->authorise('country.edit', $contexts[$pk]))
@@ -976,30 +976,30 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 				return false;
 			}
 
-			// [4890] Check that the row actually exists
+			// [5054] Check that the row actually exists
 			if (!$this->table->load($pk))
 			{
 				if ($error = $this->table->getError())
 				{
-					// [4895] Fatal error
+					// [5059] Fatal error
 					$this->setError($error);
 
 					return false;
 				}
 				else
 				{
-					// [4902] Not fatal error
+					// [5066] Not fatal error
 					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 					continue;
 				}
 			}
 
-			// [4908] insert all set values.
+			// [5072] insert all set values.
 			if (CostbenefitprojectionHelper::checkArray($values))
 			{
 				foreach ($values as $key => $value)
 				{
-					// [4913] Do special action for access.
+					// [5077] Do special action for access.
 					if ('access' == $key && strlen($value) > 0)
 					{
 						$this->table->$key = $value;
@@ -1012,7 +1012,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 			}
 
 
-			// [4925] Check the row.
+			// [5089] Check the row.
 			if (!$this->table->check())
 			{
 				$this->setError($this->table->getError());
@@ -1025,7 +1025,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 				$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
 			}
 
-			// [4938] Store the row.
+			// [5102] Store the row.
 			if (!$this->table->store())
 			{
 				$this->setError($this->table->getError());
@@ -1034,7 +1034,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 			}
 		}
 
-		// [4947] Clean the cache
+		// [5111] Clean the cache
 		$this->cleanCache();
 
 		return true;
@@ -1064,7 +1064,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 			$data['metadata'] = (string) $metadata;
 		} 
 
-		// [4169] Set the causesrisks string to JSON string.
+		// [4333] Set the causesrisks string to JSON string.
 		if (isset($data['causesrisks']))
 		{
 			$data['causesrisks'] = (string) json_encode($data['causesrisks']);
@@ -1078,7 +1078,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 			$data['params'] = (string) $params;
 		}
 
-		// [5229] Alter the name for save as copy
+		// [5393] Alter the name for save as copy
 		if ($input->get('task') == 'save2copy')
 		{
 			$origTable = clone $this->getTable();
@@ -1101,7 +1101,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 			$data['published'] = 0;
 		}
 
-		// [5256] Automatic handling of alias for empty fields
+		// [5420] 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)
@@ -1132,10 +1132,10 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 			}
 		}
 
-		// [5295] Alter the uniqe field for save as copy
+		// [5459] Alter the uniqe field for save as copy
 		if ($input->get('task') == 'save2copy')
 		{
-			// [5298] Automatic handling of other uniqe fields
+			// [5462] Automatic handling of other uniqe fields
 			$uniqeFields = $this->getUniqeFields();
 			if (CostbenefitprojectionHelper::checkArray($uniqeFields))
 			{
@@ -1189,7 +1189,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 	protected function _generateNewTitle($alias, $title)
 	{
 
-		// [5329] Alter the title & alias
+		// [5493] 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 c3f67abf..649d96d2 100644
--- a/admin/models/currencies.php
+++ b/admin/models/currencies.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		currencies.php
@@ -103,16 +103,16 @@ class CostbenefitprojectionModelCurrencies extends JModelList
 	 */
 	public function getItems()
 	{ 
-		// [10621] check in items
+		// [10792] check in items
 		$this->checkInNow();
 
 		// load parent items
 		$items = parent::getItems();
 
-		// [10696] set values to display correctly.
+		// [10867] set values to display correctly.
 		if (CostbenefitprojectionHelper::checkArray($items))
 		{
-			// [10699] get user object.
+			// [10870] get user object.
 			$user = JFactory::getUser();
 			foreach ($items as $nr => &$item)
 			{
@@ -137,19 +137,19 @@ class CostbenefitprojectionModelCurrencies extends JModelList
 	 */
 	protected function getListQuery()
 	{
-		// [7482] Get the user object.
+		// [7649] Get the user object.
 		$user = JFactory::getUser();
-		// [7484] Create a new query object.
+		// [7651] Create a new query object.
 		$db = JFactory::getDBO();
 		$query = $db->getQuery(true);
 
-		// [7487] Select some fields
+		// [7654] Select some fields
 		$query->select('a.*');
 
-		// [7494] From the costbenefitprojection_item table
+		// [7661] From the costbenefitprojection_item table
 		$query->from($db->quoteName('#__costbenefitprojection_currency', 'a'));
 
-		// [7508] Filter by published state
+		// [7675] 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)');
 		}
 
-		// [7520] Join over the asset groups.
+		// [7687] Join over the asset groups.
 		$query->select('ag.title AS access_level');
 		$query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
-		// [7523] Filter by access level.
+		// [7690] Filter by access level.
 		if ($access = $this->getState('filter.access'))
 		{
 			$query->where('a.access = ' . (int) $access);
 		}
-		// [7528] Implement View Level Access
+		// [7695] Implement View Level Access
 		if (!$user->authorise('core.options', 'com_costbenefitprojection'))
 		{
 			$groups = implode(',', $user->getAuthorisedViewLevels());
 			$query->where('a.access IN (' . $groups . ')');
 		}
-		// [7605] Filter by search.
+		// [7772] Filter by search.
 		$search = $this->getState('filter.search');
 		if (!empty($search))
 		{
@@ -190,7 +190,7 @@ class CostbenefitprojectionModelCurrencies extends JModelList
 		}
 
 
-		// [7564] Add the list ordering clause.
+		// [7731] 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)
 	{
-		// [7272] setup the query
+		// [7439] setup the query
 		if (CostbenefitprojectionHelper::checkArray($pks))
 		{
-			// [7275] Get the user object.
+			// [7442] Get the user object.
 			$user = JFactory::getUser();
-			// [7277] Create a new query object.
+			// [7444] Create a new query object.
 			$db = JFactory::getDBO();
 			$query = $db->getQuery(true);
 
-			// [7280] Select some fields
+			// [7447] Select some fields
 			$query->select('a.*');
 
-			// [7282] From the costbenefitprojection_currency table
+			// [7449] From the costbenefitprojection_currency table
 			$query->from($db->quoteName('#__costbenefitprojection_currency', 'a'));
 			$query->where('a.id IN (' . implode(',',$pks) . ')');
-			// [7292] Implement View Level Access
+			// [7459] Implement View Level Access
 			if (!$user->authorise('core.options', 'com_costbenefitprojection'))
 			{
 				$groups = implode(',', $user->getAuthorisedViewLevels());
 				$query->where('a.access IN (' . $groups . ')');
 			}
 
-			// [7299] Order the results by ordering
+			// [7466] Order the results by ordering
 			$query->order('a.ordering  ASC');
 
-			// [7301] Load the items
+			// [7468] Load the items
 			$db->setQuery($query);
 			$db->execute();
 			if ($db->getNumRows())
 			{
 				$items = $db->loadObjectList();
 
-				// [10696] set values to display correctly.
+				// [10867] set values to display correctly.
 				if (CostbenefitprojectionHelper::checkArray($items))
 				{
-					// [10699] get user object.
+					// [10870] get user object.
 					$user = JFactory::getUser();
 					foreach ($items as $nr => &$item)
 					{
@@ -254,13 +254,13 @@ class CostbenefitprojectionModelCurrencies extends JModelList
 							continue;
 						}
 
-						// [10909] unset the values we don't want exported.
+						// [11080] unset the values we don't want exported.
 						unset($item->asset_id);
 						unset($item->checked_out);
 						unset($item->checked_out_time);
 					}
 				}
-				// [10918] Add headers to items array.
+				// [11089] Add headers to items array.
 				$headers = $this->getExImPortHeaders();
 				if (CostbenefitprojectionHelper::checkObject($headers))
 				{
@@ -279,13 +279,13 @@ class CostbenefitprojectionModelCurrencies extends JModelList
 	*/
 	public function getExImPortHeaders()
 	{
-		// [7321] Get a db connection.
+		// [7488] Get a db connection.
 		$db = JFactory::getDbo();
-		// [7323] get the columns
+		// [7490] get the columns
 		$columns = $db->getTableColumns("#__costbenefitprojection_currency");
 		if (CostbenefitprojectionHelper::checkArray($columns))
 		{
-			// [7327] remove the headers you don't import/export.
+			// [7494] 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 = '')
 	{
-		// [10244] Compile the store id.
+		// [10415] 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()
 	{
-		// [10637] Get set check in time
+		// [10808] Get set check in time
 		$time = JComponentHelper::getParams('com_costbenefitprojection')->get('check_in');
 		
 		if ($time)
 		{
 
-			// [10642] Get a db connection.
+			// [10813] Get a db connection.
 			$db = JFactory::getDbo();
-			// [10644] reset query
+			// [10815] 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())
 			{
-				// [10652] Get Yesterdays date
+				// [10823] Get Yesterdays date
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// [10654] reset query
+				// [10825] reset query
 				$query = $db->getQuery(true);
 
-				// [10656] Fields to update.
+				// [10827] Fields to update.
 				$fields = array(
 					$db->quoteName('checked_out_time') . '=\'0000-00-00 00:00:00\'',
 					$db->quoteName('checked_out') . '=0'
 				);
 
-				// [10661] Conditions for which records should be updated.
+				// [10832] Conditions for which records should be updated.
 				$conditions = array(
 					$db->quoteName('checked_out') . '!=0', 
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);
 
-				// [10666] Check table
+				// [10837] 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 adbe3775..a0bd9193 100644
--- a/admin/models/currency.php
+++ b/admin/models/currency.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		currency.php
@@ -110,7 +110,7 @@ class CostbenefitprojectionModelCurrency extends JModelAdmin
 	 * @since   1.6
 	 */
 	public function getForm($data = array(), $loadData = true)
-	{		// [9651] Get the form.
+	{		// [9818] 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;
 
-		// [9736] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first.
+		// [9903] 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');
 		}
-		// [9741] The back end uses id so we use that the rest of the time and set it to 0 by default.
+		// [9908] 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();
 
-		// [9747] Check for existing item.
-		// [9748] Modify the form based on Edit State access controls.
+		// [9914] Check for existing item.
+		// [9915] 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')))
 		{
-			// [9761] Disable fields for display.
+			// [9928] Disable fields for display.
 			$form->setFieldAttribute('ordering', 'disabled', 'true');
 			$form->setFieldAttribute('published', 'disabled', 'true');
-			// [9764] Disable fields while saving.
+			// [9931] Disable fields while saving.
 			$form->setFieldAttribute('ordering', 'filter', 'unset');
 			$form->setFieldAttribute('published', 'filter', 'unset');
 		}
-		// [9769] Modify the form based on Edit Creaded By access controls.
+		// [9936] Modify the form based on Edit Creaded By access controls.
 		if (!$user->authorise('core.edit.created_by', 'com_costbenefitprojection'))
 		{
-			// [9781] Disable fields for display.
+			// [9948] Disable fields for display.
 			$form->setFieldAttribute('created_by', 'disabled', 'true');
-			// [9783] Disable fields for display.
+			// [9950] Disable fields for display.
 			$form->setFieldAttribute('created_by', 'readonly', 'true');
-			// [9785] Disable fields while saving.
+			// [9952] Disable fields while saving.
 			$form->setFieldAttribute('created_by', 'filter', 'unset');
 		}
-		// [9788] Modify the form based on Edit Creaded Date access controls.
+		// [9955] Modify the form based on Edit Creaded Date access controls.
 		if (!$user->authorise('core.edit.created', 'com_costbenefitprojection'))
 		{
-			// [9800] Disable fields for display.
+			// [9967] Disable fields for display.
 			$form->setFieldAttribute('created', 'disabled', 'true');
-			// [9802] Disable fields while saving.
+			// [9969] Disable fields while saving.
 			$form->setFieldAttribute('created', 'filter', 'unset');
 		}
 
@@ -196,7 +196,7 @@ class CostbenefitprojectionModelCurrency extends JModelAdmin
 			}
 
 			$user = JFactory::getUser();
-			// [9952] The record has been set. Check the record permissions.
+			// [10119] 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)
 		{
-			// [10039] The record has been set. Check the record permissions.
+			// [10206] 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;
 			}
 		}
-		// [10056] In the absense of better information, revert to the component permissions.
+		// [10223] 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')
 	{
-		// [9864] Check specific edit permission then general edit permission.
+		// [10031] 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');
@@ -466,7 +466,7 @@ class CostbenefitprojectionModelCurrency extends JModelAdmin
 	{
 		if (empty($this->batchSet))
 		{
-			// [5015] Set some needed variables.
+			// [5179] Set some needed variables.
 			$this->user 		= JFactory::getUser();
 			$this->table 		= $this->getTable();
 			$this->tableClassName	= get_class($this->table);
@@ -480,12 +480,12 @@ class CostbenefitprojectionModelCurrency extends JModelAdmin
 			return false;
 		}
 
-		// [5035] get list of uniqe fields
+		// [5199] get list of uniqe fields
 		$uniqeFields = $this->getUniqeFields();
-		// [5037] remove move_copy from array
+		// [5201] remove move_copy from array
 		unset($values['move_copy']);
 
-		// [5040] make sure published is set
+		// [5204] make sure published is set
 		if (!isset($values['published']))
 		{
 			$values['published'] = 0;
@@ -497,21 +497,21 @@ class CostbenefitprojectionModelCurrency extends JModelAdmin
 
 		$newIds = array();
 
-		// [5077] Parent exists so let's proceed
+		// [5241] Parent exists so let's proceed
 		while (!empty($pks))
 		{
-			// [5080] Pop the first ID off the stack
+			// [5244] Pop the first ID off the stack
 			$pk = array_shift($pks);
 
 			$this->table->reset();
 
-			// [5085] only allow copy if user may edit this item.
+			// [5249] only allow copy if user may edit this item.
 
 			if (!$this->user->authorise('currency.edit', $contexts[$pk]))
 
 			{
 
-				// [5095] Not fatal error
+				// [5259] Not fatal error
 
 				$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 
@@ -519,19 +519,19 @@ class CostbenefitprojectionModelCurrency extends JModelAdmin
 
 			}
 
-			// [5100] Check that the row actually exists
+			// [5264] Check that the row actually exists
 			if (!$this->table->load($pk))
 			{
 				if ($error = $this->table->getError())
 				{
-					// [5105] Fatal error
+					// [5269] Fatal error
 					$this->setError($error);
 
 					return false;
 				}
 				else
 				{
-					// [5112] Not fatal error
+					// [5276] Not fatal error
 					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 					continue;
 				}
@@ -539,7 +539,7 @@ class CostbenefitprojectionModelCurrency extends JModelAdmin
 
 			list($this->table->name, $this->table->alias) = $this->_generateNewTitle($this->table->alias, $this->table->name);
 
-			// [5148] insert all set values
+			// [5312] insert all set values
 			if (CostbenefitprojectionHelper::checkArray($values))
 			{
 				foreach ($values as $key => $value)
@@ -551,7 +551,7 @@ class CostbenefitprojectionModelCurrency extends JModelAdmin
 				}
 			}
 
-			// [5160] update all uniqe fields
+			// [5324] update all uniqe fields
 			if (CostbenefitprojectionHelper::checkArray($uniqeFields))
 			{
 				foreach ($uniqeFields as $uniqeField)
@@ -560,13 +560,13 @@ class CostbenefitprojectionModelCurrency extends JModelAdmin
 				}
 			}
 
-			// [5169] Reset the ID because we are making a copy
+			// [5333] Reset the ID because we are making a copy
 			$this->table->id = 0;
 
-			// [5172] TODO: Deal with ordering?
-			// [5173] $this->table->ordering	= 1;
+			// [5336] TODO: Deal with ordering?
+			// [5337] $this->table->ordering	= 1;
 
-			// [5175] Check the row.
+			// [5339] Check the row.
 			if (!$this->table->check())
 			{
 				$this->setError($this->table->getError());
@@ -579,7 +579,7 @@ class CostbenefitprojectionModelCurrency extends JModelAdmin
 				$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
 			}
 
-			// [5188] Store the row.
+			// [5352] Store the row.
 			if (!$this->table->store())
 			{
 				$this->setError($this->table->getError());
@@ -587,14 +587,14 @@ class CostbenefitprojectionModelCurrency extends JModelAdmin
 				return false;
 			}
 
-			// [5196] Get the new item ID
+			// [5360] Get the new item ID
 			$newId = $this->table->get('id');
 
-			// [5199] Add the new ID to the array
+			// [5363] Add the new ID to the array
 			$newIds[$pk] = $newId;
 		}
 
-		// [5203] Clean the cache
+		// [5367] Clean the cache
 		$this->cleanCache();
 
 		return $newIds;
@@ -615,7 +615,7 @@ class CostbenefitprojectionModelCurrency extends JModelAdmin
 	{
 		if (empty($this->batchSet))
 		{
-			// [4817] Set some needed variables.
+			// [4981] Set some needed variables.
 			$this->user		= JFactory::getUser();
 			$this->table		= $this->getTable();
 			$this->tableClassName	= get_class($this->table);
@@ -630,15 +630,15 @@ class CostbenefitprojectionModelCurrency extends JModelAdmin
 			return false;
 		}
 
-		// [4839] make sure published only updates if user has the permission.
+		// [5003] make sure published only updates if user has the permission.
 		if (isset($values['published']) && !$this->canDo->get('currency.edit.state'))
 		{
 			unset($values['published']);
 		}
-		// [4852] remove move_copy from array
+		// [5016] remove move_copy from array
 		unset($values['move_copy']);
 
-		// [4873] Parent exists so we proceed
+		// [5037] Parent exists so we proceed
 		foreach ($pks as $pk)
 		{
 			if (!$this->user->authorise('currency.edit', $contexts[$pk]))
@@ -648,30 +648,30 @@ class CostbenefitprojectionModelCurrency extends JModelAdmin
 				return false;
 			}
 
-			// [4890] Check that the row actually exists
+			// [5054] Check that the row actually exists
 			if (!$this->table->load($pk))
 			{
 				if ($error = $this->table->getError())
 				{
-					// [4895] Fatal error
+					// [5059] Fatal error
 					$this->setError($error);
 
 					return false;
 				}
 				else
 				{
-					// [4902] Not fatal error
+					// [5066] Not fatal error
 					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 					continue;
 				}
 			}
 
-			// [4908] insert all set values.
+			// [5072] insert all set values.
 			if (CostbenefitprojectionHelper::checkArray($values))
 			{
 				foreach ($values as $key => $value)
 				{
-					// [4913] Do special action for access.
+					// [5077] Do special action for access.
 					if ('access' == $key && strlen($value) > 0)
 					{
 						$this->table->$key = $value;
@@ -684,7 +684,7 @@ class CostbenefitprojectionModelCurrency extends JModelAdmin
 			}
 
 
-			// [4925] Check the row.
+			// [5089] Check the row.
 			if (!$this->table->check())
 			{
 				$this->setError($this->table->getError());
@@ -697,7 +697,7 @@ class CostbenefitprojectionModelCurrency extends JModelAdmin
 				$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
 			}
 
-			// [4938] Store the row.
+			// [5102] Store the row.
 			if (!$this->table->store())
 			{
 				$this->setError($this->table->getError());
@@ -706,7 +706,7 @@ class CostbenefitprojectionModelCurrency extends JModelAdmin
 			}
 		}
 
-		// [4947] Clean the cache
+		// [5111] Clean the cache
 		$this->cleanCache();
 
 		return true;
@@ -744,7 +744,7 @@ class CostbenefitprojectionModelCurrency extends JModelAdmin
 			$data['params'] = (string) $params;
 		}
 
-		// [5229] Alter the name for save as copy
+		// [5393] Alter the name for save as copy
 		if ($input->get('task') == 'save2copy')
 		{
 			$origTable = clone $this->getTable();
@@ -767,7 +767,7 @@ class CostbenefitprojectionModelCurrency extends JModelAdmin
 			$data['published'] = 0;
 		}
 
-		// [5256] Automatic handling of alias for empty fields
+		// [5420] 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)
@@ -798,10 +798,10 @@ class CostbenefitprojectionModelCurrency extends JModelAdmin
 			}
 		}
 
-		// [5295] Alter the uniqe field for save as copy
+		// [5459] Alter the uniqe field for save as copy
 		if ($input->get('task') == 'save2copy')
 		{
-			// [5298] Automatic handling of other uniqe fields
+			// [5462] Automatic handling of other uniqe fields
 			$uniqeFields = $this->getUniqeFields();
 			if (CostbenefitprojectionHelper::checkArray($uniqeFields))
 			{
@@ -855,7 +855,7 @@ class CostbenefitprojectionModelCurrency extends JModelAdmin
 	protected function _generateNewTitle($alias, $title)
 	{
 
-		// [5329] Alter the title & alias
+		// [5493] 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 8785521e..0a9279d7 100644
--- a/admin/models/fields/articles.php
+++ b/admin/models/fields/articles.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		articles.php
@@ -44,36 +44,36 @@ class JFormFieldArticles extends JFormFieldList
 	 */
 	protected function getInput()
 	{
-		// [7776] see if we should add buttons
+		// [7943] see if we should add buttons
 		$setButton = $this->getAttribute('button');
-		// [7778] get html
+		// [7945] get html
 		$html = parent::getInput();
-		// [7780] if true set button
+		// [7947] if true set button
 		if ($setButton === 'true')
 		{
 			$user = JFactory::getUser();
-			// [7784] only add if user allowed to create article
+			// [7951] only add if user allowed to create article
 			if ($user->authorise('core.create', 'com_costbenefitprojection'))
 			{
-				// [7802] get the input from url
+				// [7969] get the input from url
 				$jinput = JFactory::getApplication()->input;
-				// [7804] get the view name & id
+				// [7971] get the view name & id
 				$values = $jinput->getArray(array(
 					'id' => 'int',
 					'view' => 'word'
 				));
-				// [7809] check if new item
+				// [7976] check if new item
 				$ref = '';
 				if (!is_null($values['id']) && strlen($values['view']))
 				{
-					// [7813] only load referal if not new item.
+					// [7980] only load referal if not new item.
 					$ref = '&amp;ref=' . $values['view'] . '&amp;refid=' . $values['id'];
 				}
-				// [7816] build the button
+				// [7983] 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>';
-				// [7820] return the button attached to input field
+				// [7987] 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 8d891263..26f79e9c 100644
--- a/admin/models/fields/causesrisks.php
+++ b/admin/models/fields/causesrisks.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		causesrisks.php
@@ -44,36 +44,36 @@ class JFormFieldCausesrisks extends JFormFieldList
 	 */
 	protected function getInput()
 	{
-		// [7776] see if we should add buttons
+		// [7943] see if we should add buttons
 		$setButton = $this->getAttribute('button');
-		// [7778] get html
+		// [7945] get html
 		$html = parent::getInput();
-		// [7780] if true set button
+		// [7947] if true set button
 		if ($setButton === 'true')
 		{
 			$user = JFactory::getUser();
-			// [7784] only add if user allowed to create causerisk
+			// [7951] only add if user allowed to create causerisk
 			if ($user->authorise('causerisk.create', 'com_costbenefitprojection'))
 			{
-				// [7802] get the input from url
+				// [7969] get the input from url
 				$jinput = JFactory::getApplication()->input;
-				// [7804] get the view name & id
+				// [7971] get the view name & id
 				$values = $jinput->getArray(array(
 					'id' => 'int',
 					'view' => 'word'
 				));
-				// [7809] check if new item
+				// [7976] check if new item
 				$ref = '';
 				if (!is_null($values['id']) && strlen($values['view']))
 				{
-					// [7813] only load referal if not new item.
+					// [7980] only load referal if not new item.
 					$ref = '&amp;ref=' . $values['view'] . '&amp;refid=' . $values['id'];
 				}
-				// [7816] build the button
+				// [7983] 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>';
-				// [7820] return the button attached to input field
+				// [7987] 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 09eb26c2..13a1079f 100644
--- a/admin/models/fields/causesriskscheck.php
+++ b/admin/models/fields/causesriskscheck.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		causesriskscheck.php
diff --git a/admin/models/fields/company.php b/admin/models/fields/company.php
index fc1f21e8..c478794a 100644
--- a/admin/models/fields/company.php
+++ b/admin/models/fields/company.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		company.php
@@ -44,36 +44,36 @@ class JFormFieldCompany extends JFormFieldList
 	 */
 	protected function getInput()
 	{
-		// [7776] see if we should add buttons
+		// [7943] see if we should add buttons
 		$setButton = $this->getAttribute('button');
-		// [7778] get html
+		// [7945] get html
 		$html = parent::getInput();
-		// [7780] if true set button
+		// [7947] if true set button
 		if ($setButton === 'true')
 		{
 			$user = JFactory::getUser();
-			// [7784] only add if user allowed to create company
+			// [7951] only add if user allowed to create company
 			if ($user->authorise('company.create', 'com_costbenefitprojection'))
 			{
-				// [7802] get the input from url
+				// [7969] get the input from url
 				$jinput = JFactory::getApplication()->input;
-				// [7804] get the view name & id
+				// [7971] get the view name & id
 				$values = $jinput->getArray(array(
 					'id' => 'int',
 					'view' => 'word'
 				));
-				// [7809] check if new item
+				// [7976] check if new item
 				$ref = '';
 				if (!is_null($values['id']) && strlen($values['view']))
 				{
-					// [7813] only load referal if not new item.
+					// [7980] only load referal if not new item.
 					$ref = '&amp;ref=' . $values['view'] . '&amp;refid=' . $values['id'];
 				}
-				// [7816] build the button
+				// [7983] 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>';
-				// [7820] return the button attached to input field
+				// [7987] 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 ec4f8fcb..cd6c11e5 100644
--- a/admin/models/fields/countries.php
+++ b/admin/models/fields/countries.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		countries.php
@@ -44,36 +44,36 @@ class JFormFieldCountries extends JFormFieldList
 	 */
 	protected function getInput()
 	{
-		// [7776] see if we should add buttons
+		// [7943] see if we should add buttons
 		$setButton = $this->getAttribute('button');
-		// [7778] get html
+		// [7945] get html
 		$html = parent::getInput();
-		// [7780] if true set button
+		// [7947] if true set button
 		if ($setButton === 'true')
 		{
 			$user = JFactory::getUser();
-			// [7784] only add if user allowed to create country
+			// [7951] only add if user allowed to create country
 			if ($user->authorise('country.create', 'com_costbenefitprojection'))
 			{
-				// [7802] get the input from url
+				// [7969] get the input from url
 				$jinput = JFactory::getApplication()->input;
-				// [7804] get the view name & id
+				// [7971] get the view name & id
 				$values = $jinput->getArray(array(
 					'id' => 'int',
 					'view' => 'word'
 				));
-				// [7809] check if new item
+				// [7976] check if new item
 				$ref = '';
 				if (!is_null($values['id']) && strlen($values['view']))
 				{
-					// [7813] only load referal if not new item.
+					// [7980] only load referal if not new item.
 					$ref = '&amp;ref=' . $values['view'] . '&amp;refid=' . $values['id'];
 				}
-				// [7816] build the button
+				// [7983] 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>';
-				// [7820] return the button attached to input field
+				// [7987] 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 62e167da..ac63bcfa 100644
--- a/admin/models/fields/countryuser.php
+++ b/admin/models/fields/countryuser.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		countryuser.php
diff --git a/admin/models/fields/currency.php b/admin/models/fields/currency.php
index 03e61f3c..70e76388 100644
--- a/admin/models/fields/currency.php
+++ b/admin/models/fields/currency.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		currency.php
@@ -44,36 +44,36 @@ class JFormFieldCurrency extends JFormFieldList
 	 */
 	protected function getInput()
 	{
-		// [7776] see if we should add buttons
+		// [7943] see if we should add buttons
 		$setButton = $this->getAttribute('button');
-		// [7778] get html
+		// [7945] get html
 		$html = parent::getInput();
-		// [7780] if true set button
+		// [7947] if true set button
 		if ($setButton === 'true')
 		{
 			$user = JFactory::getUser();
-			// [7784] only add if user allowed to create currency
+			// [7951] only add if user allowed to create currency
 			if ($user->authorise('currency.create', 'com_costbenefitprojection'))
 			{
-				// [7802] get the input from url
+				// [7969] get the input from url
 				$jinput = JFactory::getApplication()->input;
-				// [7804] get the view name & id
+				// [7971] get the view name & id
 				$values = $jinput->getArray(array(
 					'id' => 'int',
 					'view' => 'word'
 				));
-				// [7809] check if new item
+				// [7976] check if new item
 				$ref = '';
 				if (!is_null($values['id']) && strlen($values['view']))
 				{
-					// [7813] only load referal if not new item.
+					// [7980] only load referal if not new item.
 					$ref = '&amp;ref=' . $values['view'] . '&amp;refid=' . $values['id'];
 				}
-				// [7816] build the button
+				// [7983] 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>';
-				// [7820] return the button attached to input field
+				// [7987] 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 19341112..5124afb0 100644
--- a/admin/models/fields/datayear.php
+++ b/admin/models/fields/datayear.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		datayear.php
@@ -44,36 +44,36 @@ class JFormFieldDatayear extends JFormFieldList
 	 */
 	protected function getInput()
 	{
-		// [7776] see if we should add buttons
+		// [7943] see if we should add buttons
 		$setButton = $this->getAttribute('button');
-		// [7778] get html
+		// [7945] get html
 		$html = parent::getInput();
-		// [7780] if true set button
+		// [7947] if true set button
 		if ($setButton === 'true')
 		{
 			$user = JFactory::getUser();
-			// [7784] only add if user allowed to create health_data
+			// [7951] only add if user allowed to create health_data
 			if ($user->authorise('health_data.create', 'com_costbenefitprojection'))
 			{
-				// [7802] get the input from url
+				// [7969] get the input from url
 				$jinput = JFactory::getApplication()->input;
-				// [7804] get the view name & id
+				// [7971] get the view name & id
 				$values = $jinput->getArray(array(
 					'id' => 'int',
 					'view' => 'word'
 				));
-				// [7809] check if new item
+				// [7976] check if new item
 				$ref = '';
 				if (!is_null($values['id']) && strlen($values['view']))
 				{
-					// [7813] only load referal if not new item.
+					// [7980] only load referal if not new item.
 					$ref = '&amp;ref=' . $values['view'] . '&amp;refid=' . $values['id'];
 				}
-				// [7816] build the button
+				// [7983] 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>';
-				// [7820] return the button attached to input field
+				// [7987] 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 faade344..bf6be28d 100644
--- a/admin/models/fields/interventions.php
+++ b/admin/models/fields/interventions.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		interventions.php
@@ -44,36 +44,36 @@ class JFormFieldInterventions extends JFormFieldList
 	 */
 	protected function getInput()
 	{
-		// [7776] see if we should add buttons
+		// [7943] see if we should add buttons
 		$setButton = $this->getAttribute('button');
-		// [7778] get html
+		// [7945] get html
 		$html = parent::getInput();
-		// [7780] if true set button
+		// [7947] if true set button
 		if ($setButton === 'true')
 		{
 			$user = JFactory::getUser();
-			// [7784] only add if user allowed to create intervention
+			// [7951] only add if user allowed to create intervention
 			if ($user->authorise('intervention.create', 'com_costbenefitprojection'))
 			{
-				// [7802] get the input from url
+				// [7969] get the input from url
 				$jinput = JFactory::getApplication()->input;
-				// [7804] get the view name & id
+				// [7971] get the view name & id
 				$values = $jinput->getArray(array(
 					'id' => 'int',
 					'view' => 'word'
 				));
-				// [7809] check if new item
+				// [7976] check if new item
 				$ref = '';
 				if (!is_null($values['id']) && strlen($values['view']))
 				{
-					// [7813] only load referal if not new item.
+					// [7980] only load referal if not new item.
 					$ref = '&amp;ref=' . $values['view'] . '&amp;refid=' . $values['id'];
 				}
-				// [7816] build the button
+				// [7983] 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>';
-				// [7820] return the button attached to input field
+				// [7987] 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 43defda6..2293484b 100644
--- a/admin/models/fields/memberuser.php
+++ b/admin/models/fields/memberuser.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		memberuser.php
diff --git a/admin/models/fields/serviceprovider.php b/admin/models/fields/serviceprovider.php
index b8e4b4f3..86336535 100644
--- a/admin/models/fields/serviceprovider.php
+++ b/admin/models/fields/serviceprovider.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		serviceprovider.php
@@ -44,36 +44,36 @@ class JFormFieldServiceprovider extends JFormFieldList
 	 */
 	protected function getInput()
 	{
-		// [7776] see if we should add buttons
+		// [7943] see if we should add buttons
 		$setButton = $this->getAttribute('button');
-		// [7778] get html
+		// [7945] get html
 		$html = parent::getInput();
-		// [7780] if true set button
+		// [7947] if true set button
 		if ($setButton === 'true')
 		{
 			$user = JFactory::getUser();
-			// [7784] only add if user allowed to create service_provider
+			// [7951] only add if user allowed to create service_provider
 			if ($user->authorise('service_provider.create', 'com_costbenefitprojection'))
 			{
-				// [7802] get the input from url
+				// [7969] get the input from url
 				$jinput = JFactory::getApplication()->input;
-				// [7804] get the view name & id
+				// [7971] get the view name & id
 				$values = $jinput->getArray(array(
 					'id' => 'int',
 					'view' => 'word'
 				));
-				// [7809] check if new item
+				// [7976] check if new item
 				$ref = '';
 				if (!is_null($values['id']) && strlen($values['view']))
 				{
-					// [7813] only load referal if not new item.
+					// [7980] only load referal if not new item.
 					$ref = '&amp;ref=' . $values['view'] . '&amp;refid=' . $values['id'];
 				}
-				// [7816] build the button
+				// [7983] 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>';
-				// [7820] return the button attached to input field
+				// [7987] 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 0051c9b5..7d480f3a 100644
--- a/admin/models/fields/serviceprovideruser.php
+++ b/admin/models/fields/serviceprovideruser.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		serviceprovideruser.php
diff --git a/admin/models/forms/causerisk.js b/admin/models/forms/causerisk.js
index 2bfd3db9..7790267b 100644
--- a/admin/models/forms/causerisk.js
+++ b/admin/models/forms/causerisk.js
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		causerisk.js
diff --git a/admin/models/forms/causerisk.xml b/admin/models/forms/causerisk.xml
index 1769a561..1db0fd73 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">
-		<!-- [11104] Default Fields. -->
-		<!-- [11105] Id Field. Type: Text (joomla) -->
+		<!-- [11275] Default Fields. -->
+		<!-- [11276] 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"
 		/>
-		<!-- [11112] Date Created Field. Type: Calendar (joomla) -->
+		<!-- [11283] 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"
 		/>
-		<!-- [11123] User Created Field. Type: User (joomla) -->
+		<!-- [11294] 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"
 		/>
-		<!-- [11131] Published Field. Type: List (joomla) -->
+		<!-- [11302] 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>
-		<!-- [11146] Date Modified Field. Type: Calendar (joomla) -->
+		<!-- [11317] 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" />
-		<!-- [11150] User Modified Field. Type: User (joomla) -->
+		<!-- [11321] User Modified Field. Type: User (joomla) -->
 		<field name="modified_by" type="user"
 			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
 			class="readonly"
 			readonly="true"
 			filter="unset"
 		/>
-		<!-- [11160] Access Field. Type: Accesslevel (joomla) -->
+		<!-- [11331] Access Field. Type: Accesslevel (joomla) -->
 		<field name="access"
 			type="accesslevel"
 			label="JFIELD_ACCESS_LABEL"
@@ -61,7 +61,7 @@
 			default="1"
 			required="false"
 		/>
-		<!-- [11170] Ordering Field. Type: Numbers (joomla) -->
+		<!-- [11341] Ordering Field. Type: Numbers (joomla) -->
 		<field
 			name="ordering"
 			type="number"
@@ -72,7 +72,7 @@
 			size="6"
 			required="false"
 		/>
-		<!-- [11182] Version Field. Type: Text (joomla) -->
+		<!-- [11353] Version Field. Type: Text (joomla) -->
 		<field
 			name="version"
 			type="text"
@@ -83,8 +83,8 @@
 			readonly="true"
 			filter="unset"
 		/>
-		<!-- [11215] Dynamic Fields. -->
-		<!-- [11451] Name Field. Type: Text. (joomla) -->
+		<!-- [11386] Dynamic Fields. -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11451] Ref Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11451] Importname Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11451] Description Field. Type: Textarea. (joomla) -->
+		<!-- [11622] Description Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
 			name="description"
@@ -144,7 +144,7 @@
 			filter="HTML"
 			hint="COM_COSTBENEFITPROJECTION_CAUSERISK_DESCRIPTION_HINT"
 		/>
-		<!-- [11451] Alias Field. Type: Text. (joomla) -->
+		<!-- [11622] Alias Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="alias"
@@ -155,15 +155,15 @@
 		/>
 	</fieldset>
 	
-	<!-- [10138] Access Control Fields. -->
+	<!-- [10308] Access Control Fields. -->
 	<fieldset name="accesscontrol">
-		<!-- [10140] Asset Id Field. Type: Hidden (joomla) -->
+		<!-- [10310] Asset Id Field. Type: Hidden (joomla) -->
 		<field
 			name="asset_id"
 			type="hidden"
 			filter="unset"
 		/>
-		<!-- [10146] Rules Field. Type: Rules (joomla) -->
+		<!-- [10316] 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 1f2fdcbe..2a67f464 100644
--- a/admin/models/forms/company.js
+++ b/admin/models/forms/company.js
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		company.js
@@ -17,178 +17,178 @@
 /------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_FemBBLxWWw_required = false;
-jform_FemBBLxOlP_required = false;
-jform_FemBBLxnqq_required = false;
-jform_FemBBLxxqn_required = false;
-jform_FemBBLxlWa_required = false;
-jform_FemBBLxJnd_required = false;
-jform_FemBBLxGml_required = false;
+jform_bETABWBlov_required = false;
+jform_bETABWBfSN_required = false;
+jform_bETABWBwqJ_required = false;
+jform_bETABWBsAq_required = false;
+jform_bETABWBBFR_required = false;
+jform_bETABWBYeQ_required = false;
+jform_bETABWBPbA_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var department_FemBBLx = jQuery("#jform_department input[type='radio']:checked").val();
-	FemBBLx(department_FemBBLx);
+	var department_bETABWB = jQuery("#jform_department input[type='radio']:checked").val();
+	bETABWB(department_bETABWB);
 
-	var department_kUrQZMs = jQuery("#jform_department input[type='radio']:checked").val();
-	kUrQZMs(department_kUrQZMs);
+	var department_RkgSPam = jQuery("#jform_department input[type='radio']:checked").val();
+	RkgSPam(department_RkgSPam);
 });
 
-// the FemBBLx function
-function FemBBLx(department_FemBBLx)
+// the bETABWB function
+function bETABWB(department_bETABWB)
 {
-	// [8093] set the function logic
-	if (department_FemBBLx == 2)
+	// [8260] set the function logic
+	if (department_bETABWB == 2)
 	{
 		jQuery('#jform_causesrisks').closest('.control-group').show();
-		if (jform_FemBBLxWWw_required)
+		if (jform_bETABWBlov_required)
 		{
 			updateFieldRequired('causesrisks',0);
 			jQuery('#jform_causesrisks').prop('required','required');
 			jQuery('#jform_causesrisks').attr('aria-required',true);
 			jQuery('#jform_causesrisks').addClass('required');
-			jform_FemBBLxWWw_required = false;
+			jform_bETABWBlov_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_FemBBLxOlP_required)
+		if (jform_bETABWBfSN_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_FemBBLxOlP_required = false;
+			jform_bETABWBfSN_required = false;
 		}
 
 		jQuery('#jform_medical_turnovers_females').closest('.control-group').show();
-		if (jform_FemBBLxnqq_required)
+		if (jform_bETABWBwqJ_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_FemBBLxnqq_required = false;
+			jform_bETABWBwqJ_required = false;
 		}
 
 		jQuery('#jform_medical_turnovers_males').closest('.control-group').show();
-		if (jform_FemBBLxxqn_required)
+		if (jform_bETABWBsAq_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_FemBBLxxqn_required = false;
+			jform_bETABWBsAq_required = false;
 		}
 
 		jQuery('#jform_sick_leave_females').closest('.control-group').show();
-		if (jform_FemBBLxlWa_required)
+		if (jform_bETABWBBFR_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_FemBBLxlWa_required = false;
+			jform_bETABWBBFR_required = false;
 		}
 
 		jQuery('#jform_sick_leave_males').closest('.control-group').show();
-		if (jform_FemBBLxJnd_required)
+		if (jform_bETABWBYeQ_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_FemBBLxJnd_required = false;
+			jform_bETABWBYeQ_required = false;
 		}
 
 		jQuery('#jform_total_healthcare').closest('.control-group').show();
-		if (jform_FemBBLxGml_required)
+		if (jform_bETABWBPbA_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_FemBBLxGml_required = false;
+			jform_bETABWBPbA_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_causesrisks').closest('.control-group').hide();
-		if (!jform_FemBBLxWWw_required)
+		if (!jform_bETABWBlov_required)
 		{
 			updateFieldRequired('causesrisks',1);
 			jQuery('#jform_causesrisks').removeAttr('required');
 			jQuery('#jform_causesrisks').removeAttr('aria-required');
 			jQuery('#jform_causesrisks').removeClass('required');
-			jform_FemBBLxWWw_required = true;
+			jform_bETABWBlov_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_FemBBLxOlP_required)
+		if (!jform_bETABWBfSN_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_FemBBLxOlP_required = true;
+			jform_bETABWBfSN_required = true;
 		}
 		jQuery('#jform_medical_turnovers_females').closest('.control-group').hide();
-		if (!jform_FemBBLxnqq_required)
+		if (!jform_bETABWBwqJ_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_FemBBLxnqq_required = true;
+			jform_bETABWBwqJ_required = true;
 		}
 		jQuery('#jform_medical_turnovers_males').closest('.control-group').hide();
-		if (!jform_FemBBLxxqn_required)
+		if (!jform_bETABWBsAq_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_FemBBLxxqn_required = true;
+			jform_bETABWBsAq_required = true;
 		}
 		jQuery('#jform_sick_leave_females').closest('.control-group').hide();
-		if (!jform_FemBBLxlWa_required)
+		if (!jform_bETABWBBFR_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_FemBBLxlWa_required = true;
+			jform_bETABWBBFR_required = true;
 		}
 		jQuery('#jform_sick_leave_males').closest('.control-group').hide();
-		if (!jform_FemBBLxJnd_required)
+		if (!jform_bETABWBYeQ_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_FemBBLxJnd_required = true;
+			jform_bETABWBYeQ_required = true;
 		}
 		jQuery('#jform_total_healthcare').closest('.control-group').hide();
-		if (!jform_FemBBLxGml_required)
+		if (!jform_bETABWBPbA_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_FemBBLxGml_required = true;
+			jform_bETABWBPbA_required = true;
 		}
 	}
 }
 
-// the kUrQZMs function
-function kUrQZMs(department_kUrQZMs)
+// the RkgSPam function
+function RkgSPam(department_RkgSPam)
 {
-	// [8093] set the function logic
-	if (department_kUrQZMs == 1)
+	// [8260] set the function logic
+	if (department_RkgSPam == 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 6327339a..2c2289c9 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">
-		<!-- [11104] Default Fields. -->
-		<!-- [11105] Id Field. Type: Text (joomla) -->
+		<!-- [11275] Default Fields. -->
+		<!-- [11276] 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"
 		/>
-		<!-- [11112] Date Created Field. Type: Calendar (joomla) -->
+		<!-- [11283] 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"
 		/>
-		<!-- [11123] User Created Field. Type: User (joomla) -->
+		<!-- [11294] 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"
 		/>
-		<!-- [11131] Published Field. Type: List (joomla) -->
+		<!-- [11302] 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>
-		<!-- [11146] Date Modified Field. Type: Calendar (joomla) -->
+		<!-- [11317] 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" />
-		<!-- [11150] User Modified Field. Type: User (joomla) -->
+		<!-- [11321] User Modified Field. Type: User (joomla) -->
 		<field name="modified_by" type="user"
 			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
 			class="readonly"
 			readonly="true"
 			filter="unset"
 		/>
-		<!-- [11160] Access Field. Type: Accesslevel (joomla) -->
+		<!-- [11331] Access Field. Type: Accesslevel (joomla) -->
 		<field name="access"
 			type="accesslevel"
 			label="JFIELD_ACCESS_LABEL"
@@ -61,7 +61,7 @@
 			default="1"
 			required="false"
 		/>
-		<!-- [11170] Ordering Field. Type: Numbers (joomla) -->
+		<!-- [11341] Ordering Field. Type: Numbers (joomla) -->
 		<field
 			name="ordering"
 			type="number"
@@ -72,7 +72,7 @@
 			size="6"
 			required="false"
 		/>
-		<!-- [11182] Version Field. Type: Text (joomla) -->
+		<!-- [11353] Version Field. Type: Text (joomla) -->
 		<field
 			name="version"
 			type="text"
@@ -83,8 +83,8 @@
 			readonly="true"
 			filter="unset"
 		/>
-		<!-- [11215] Dynamic Fields. -->
-		<!-- [11451] Name Field. Type: Text. (joomla) -->
+		<!-- [11386] Dynamic Fields. -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11451] Email Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11572] User Field. Type: Memberuser. (custom) -->
+		<!-- [11743] User Field. Type: Memberuser. (custom) -->
 		<field
 			type="memberuser"
 			name="user"
@@ -123,7 +123,7 @@
 			required="false"
 			hint="COM_COSTBENEFITPROJECTION_COMPANY_USER_HINT"
 		/>
-		<!-- [11365] Department Field. Type: Radio. (joomla) -->
+		<!-- [11536] Department Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
 			name="department"
@@ -131,13 +131,13 @@
 			class="btn-group"
 			default="1"
 			required="true">
-			<!-- [11437] Option Set. -->
+			<!-- [11608] Option Set. -->
 			<option value="1">
 				COM_COSTBENEFITPROJECTION_COMPANY_BASIC</option>
 			<option value="2">
 				COM_COSTBENEFITPROJECTION_COMPANY_ADVANCED</option>
 		</field>
-		<!-- [11572] Country Field. Type: Countries. (custom) -->
+		<!-- [11743] Country Field. Type: Countries. (custom) -->
 		<field
 			type="countries"
 			name="country"
@@ -148,7 +148,7 @@
 			default="0"
 			required="true"
 		/>
-		<!-- [11572] Serviceprovider Field. Type: Serviceprovider. (custom) -->
+		<!-- [11743] Serviceprovider Field. Type: Serviceprovider. (custom) -->
 		<field
 			type="serviceprovider"
 			name="serviceprovider"
@@ -159,7 +159,7 @@
 			required="true"
 			button="true"
 		/>
-		<!-- [11365] Per Field. Type: Radio. (joomla) -->
+		<!-- [11536] Per Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
 			name="per"
@@ -168,13 +168,13 @@
 			class="btn-group btn-group-yesno"
 			default="1"
 			required="true">
-			<!-- [11437] Option Set. -->
+			<!-- [11608] Option Set. -->
 			<option value="1">
 				COM_COSTBENEFITPROJECTION_COMPANY_OPEN</option>
 			<option value="0">
 				COM_COSTBENEFITPROJECTION_COMPANY_LOCKED</option>
 		</field>
-		<!-- [11451] Medical_turnovers_males Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11451] Sick_leave_males Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11451] Males Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11572] Causesrisks Field. Type: Causesriskscheck. (custom) -->
+		<!-- [11743] Causesrisks Field. Type: Causesriskscheck. (custom) -->
 		<field
 			type="causesriskscheck"
 			name="causesrisks"
@@ -230,9 +230,9 @@
 			class="list_class"
 			required="true"
 		/>
-		<!-- [11465] Age_groups_note Field. Type: Note. A None Database Field. (joomla) -->
+		<!-- [11636] 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" />
-		<!-- [11482] Percentfemale Field. Type: Repeatable. (joomla) -->
+		<!-- [11653] 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">
-					<!-- [11365] Age Field. Type: List. (joomla) -->
+					<!-- [11536] Age Field. Type: List. (joomla) -->
 					<field
 						type="list"
 						name="age"
@@ -253,7 +253,7 @@
 						class="list_class"
 						multiple="false"
 						filter="CMD">
-						<!-- [11437] Option Set. -->
+						<!-- [11608] 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>
-					<!-- [11451] Percent Field. Type: Text. (joomla) -->
+					<!-- [11622] Percent Field. Type: Text. (joomla) -->
 					<field
 						type="text"
 						name="percent"
@@ -292,7 +292,7 @@
 				</fieldset>
 			</fields>
 		</field>
-		<!-- [11451] Females Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11572] Datayear Field. Type: Datayear. (custom) -->
+		<!-- [11743] Datayear Field. Type: Datayear. (custom) -->
 		<field
 			type="datayear"
 			name="datayear"
@@ -318,7 +318,7 @@
 			multiple="false"
 			default="0"
 		/>
-		<!-- [11451] Medical_turnovers_females Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11451] Working_days Field. Type: Integer. (joomla) -->
+		<!-- [11622] Working_days Field. Type: Integer. (joomla) -->
 		<field
 			type="integer"
 			name="working_days"
@@ -347,7 +347,7 @@
 			last="365"
 			step="1"
 		/>
-		<!-- [11451] Sick_leave_females Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11451] Total_salary Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11482] Percentmale Field. Type: Repeatable. (joomla) -->
+		<!-- [11653] 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">
-					<!-- [11365] Age Field. Type: List. (joomla) -->
+					<!-- [11536] Age Field. Type: List. (joomla) -->
 					<field
 						type="list"
 						name="age"
@@ -400,7 +400,7 @@
 						class="list_class"
 						multiple="false"
 						filter="CMD">
-						<!-- [11437] Option Set. -->
+						<!-- [11608] 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>
-					<!-- [11451] Percent Field. Type: Text. (joomla) -->
+					<!-- [11622] Percent Field. Type: Text. (joomla) -->
 					<field
 						type="text"
 						name="percent"
@@ -439,7 +439,7 @@
 				</fieldset>
 			</fields>
 		</field>
-		<!-- [11451] Total_healthcare Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11465] Cause_risk_selection_note Field. Type: Note. A None Database Field. (joomla) -->
+		<!-- [11636] 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" />
-		<!-- [11451] Productivity_losses Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11451] Not_required Field. Type: Hidden. (joomla) -->
+		<!-- [11622] Not_required Field. Type: Hidden. (joomla) -->
 		<field
 			type="hidden"
 			name="not_required"
@@ -481,15 +481,15 @@
 		/>
 	</fieldset>
 	
-	<!-- [10138] Access Control Fields. -->
+	<!-- [10308] Access Control Fields. -->
 	<fieldset name="accesscontrol">
-		<!-- [10140] Asset Id Field. Type: Hidden (joomla) -->
+		<!-- [10310] Asset Id Field. Type: Hidden (joomla) -->
 		<field
 			name="asset_id"
 			type="hidden"
 			filter="unset"
 		/>
-		<!-- [10146] Rules Field. Type: Rules (joomla) -->
+		<!-- [10316] 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 572d3594..ae241e7c 100644
--- a/admin/models/forms/country.js
+++ b/admin/models/forms/country.js
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		country.js
diff --git a/admin/models/forms/country.xml b/admin/models/forms/country.xml
index 97e5ce9b..a6eef592 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">
-		<!-- [11104] Default Fields. -->
-		<!-- [11105] Id Field. Type: Text (joomla) -->
+		<!-- [11275] Default Fields. -->
+		<!-- [11276] 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"
 		/>
-		<!-- [11112] Date Created Field. Type: Calendar (joomla) -->
+		<!-- [11283] 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"
 		/>
-		<!-- [11123] User Created Field. Type: User (joomla) -->
+		<!-- [11294] 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"
 		/>
-		<!-- [11131] Published Field. Type: List (joomla) -->
+		<!-- [11302] 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>
-		<!-- [11146] Date Modified Field. Type: Calendar (joomla) -->
+		<!-- [11317] 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" />
-		<!-- [11150] User Modified Field. Type: User (joomla) -->
+		<!-- [11321] User Modified Field. Type: User (joomla) -->
 		<field name="modified_by" type="user"
 			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
 			class="readonly"
 			readonly="true"
 			filter="unset"
 		/>
-		<!-- [11160] Access Field. Type: Accesslevel (joomla) -->
+		<!-- [11331] Access Field. Type: Accesslevel (joomla) -->
 		<field name="access"
 			type="accesslevel"
 			label="JFIELD_ACCESS_LABEL"
@@ -61,7 +61,7 @@
 			default="1"
 			required="false"
 		/>
-		<!-- [11170] Ordering Field. Type: Numbers (joomla) -->
+		<!-- [11341] Ordering Field. Type: Numbers (joomla) -->
 		<field
 			name="ordering"
 			type="number"
@@ -72,7 +72,7 @@
 			size="6"
 			required="false"
 		/>
-		<!-- [11182] Version Field. Type: Text (joomla) -->
+		<!-- [11353] Version Field. Type: Text (joomla) -->
 		<field
 			name="version"
 			type="text"
@@ -83,8 +83,8 @@
 			readonly="true"
 			filter="unset"
 		/>
-		<!-- [11215] Dynamic Fields. -->
-		<!-- [11451] Name Field. Type: Text. (joomla) -->
+		<!-- [11386] Dynamic Fields. -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11572] User Field. Type: Countryuser. (custom) -->
+		<!-- [11743] User Field. Type: Countryuser. (custom) -->
 		<field
 			type="countryuser"
 			name="user"
 			label="COM_COSTBENEFITPROJECTION_COUNTRY_USER_LABEL"
 			hint="COM_COSTBENEFITPROJECTION_COUNTRY_USER_HINT"
 		/>
-		<!-- [11572] Currency Field. Type: Currency. (custom) -->
+		<!-- [11743] Currency Field. Type: Currency. (custom) -->
 		<field
 			type="currency"
 			name="currency"
@@ -117,7 +117,7 @@
 			multiple="false"
 			required="true"
 		/>
-		<!-- [11451] Codethree Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11451] Codetwo Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11451] Working_days Field. Type: Integer. (joomla) -->
+		<!-- [11622] Working_days Field. Type: Integer. (joomla) -->
 		<field
 			type="integer"
 			name="working_days"
@@ -158,7 +158,7 @@
 			last="365"
 			step="1"
 		/>
-		<!-- [11451] Productivity_losses Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11572] Datayear Field. Type: Datayear. (custom) -->
+		<!-- [11743] Datayear Field. Type: Datayear. (custom) -->
 		<field
 			type="datayear"
 			name="datayear"
@@ -184,7 +184,7 @@
 			multiple="false"
 			default="0"
 		/>
-		<!-- [11451] Worldzone Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11451] Publicaddress Field. Type: Editor. (joomla) -->
+		<!-- [11622] Publicaddress Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
 			name="publicaddress"
@@ -208,7 +208,7 @@
 			buttons="false"
 			filter="safehtml"
 		/>
-		<!-- [11451] Publicemail Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11482] Percentfemale Field. Type: Repeatable. (joomla) -->
+		<!-- [11653] 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">
-					<!-- [11365] Age Field. Type: List. (joomla) -->
+					<!-- [11536] Age Field. Type: List. (joomla) -->
 					<field
 						type="list"
 						name="age"
@@ -243,7 +243,7 @@
 						class="list_class"
 						multiple="false"
 						filter="CMD">
-						<!-- [11437] Option Set. -->
+						<!-- [11608] 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>
-					<!-- [11451] Percent Field. Type: Text. (joomla) -->
+					<!-- [11622] Percent Field. Type: Text. (joomla) -->
 					<field
 						type="text"
 						name="percent"
@@ -282,7 +282,7 @@
 				</fieldset>
 			</fields>
 		</field>
-		<!-- [11451] Alias Field. Type: Text. (joomla) -->
+		<!-- [11622] Alias Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="alias"
@@ -291,7 +291,7 @@
 			filter="STRING"
 			hint="COM_COSTBENEFITPROJECTION_COUNTRY_ALIAS_HINT"
 		/>
-		<!-- [11482] Maledeath Field. Type: Repeatable. (joomla) -->
+		<!-- [11653] 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">
-					<!-- [11365] Age Field. Type: List. (joomla) -->
+					<!-- [11536] Age Field. Type: List. (joomla) -->
 					<field
 						type="list"
 						name="age"
@@ -311,7 +311,7 @@
 						class="list_class"
 						multiple="false"
 						filter="CMD">
-						<!-- [11437] Option Set. -->
+						<!-- [11608] 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>
-					<!-- [11451] Number Field. Type: Text. (joomla) -->
+					<!-- [11622] 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"
 					/>
-					<!-- [11365] Year Field. Type: List. (joomla) -->
+					<!-- [11536] Year Field. Type: List. (joomla) -->
 					<field
 						type="list"
 						name="year"
@@ -355,7 +355,7 @@
 						class="list_class"
 						multiple="false"
 						filter="INT">
-						<!-- [11437] Option Set. -->
+						<!-- [11608] Option Set. -->
 						<option value="">
 							COM_COSTBENEFITPROJECTION_COUNTRY_SELECT_A_YEAR</option>
 						<option value="2010">
@@ -392,7 +392,7 @@
 				</fieldset>
 			</fields>
 		</field>
-		<!-- [11451] Publicname Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11482] Maleyld Field. Type: Repeatable. (joomla) -->
+		<!-- [11653] 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">
-					<!-- [11365] Age Field. Type: List. (joomla) -->
+					<!-- [11536] Age Field. Type: List. (joomla) -->
 					<field
 						type="list"
 						name="age"
@@ -427,7 +427,7 @@
 						class="list_class"
 						multiple="false"
 						filter="CMD">
-						<!-- [11437] Option Set. -->
+						<!-- [11608] 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>
-					<!-- [11451] Number Field. Type: Text. (joomla) -->
+					<!-- [11622] 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"
 					/>
-					<!-- [11365] Year Field. Type: List. (joomla) -->
+					<!-- [11536] Year Field. Type: List. (joomla) -->
 					<field
 						type="list"
 						name="year"
@@ -471,7 +471,7 @@
 						class="list_class"
 						multiple="false"
 						filter="INT">
-						<!-- [11437] Option Set. -->
+						<!-- [11608] Option Set. -->
 						<option value="">
 							COM_COSTBENEFITPROJECTION_COUNTRY_SELECT_A_YEAR</option>
 						<option value="2010">
@@ -508,7 +508,7 @@
 				</fieldset>
 			</fields>
 		</field>
-		<!-- [11451] Publicnumber Field. Type: Tel. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11451] Presenteeism Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11482] Percentmale Field. Type: Repeatable. (joomla) -->
+		<!-- [11653] 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">
-					<!-- [11365] Age Field. Type: List. (joomla) -->
+					<!-- [11536] Age Field. Type: List. (joomla) -->
 					<field
 						type="list"
 						name="age"
@@ -559,7 +559,7 @@
 						class="list_class"
 						multiple="false"
 						filter="CMD">
-						<!-- [11437] Option Set. -->
+						<!-- [11608] 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>
-					<!-- [11451] Percent Field. Type: Text. (joomla) -->
+					<!-- [11622] Percent Field. Type: Text. (joomla) -->
 					<field
 						type="text"
 						name="percent"
@@ -598,7 +598,7 @@
 				</fieldset>
 			</fields>
 		</field>
-		<!-- [11451] Medical_turnovers Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11572] Causesrisks Field. Type: Causesriskscheck. (custom) -->
+		<!-- [11743] Causesrisks Field. Type: Causesriskscheck. (custom) -->
 		<field
 			type="causesriskscheck"
 			name="causesrisks"
@@ -622,7 +622,7 @@
 			class="list_class"
 			required="true"
 		/>
-		<!-- [11451] Sick_leave Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11482] Femaledeath Field. Type: Repeatable. (joomla) -->
+		<!-- [11653] 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">
-					<!-- [11365] Age Field. Type: List. (joomla) -->
+					<!-- [11536] Age Field. Type: List. (joomla) -->
 					<field
 						type="list"
 						name="age"
@@ -658,7 +658,7 @@
 						class="list_class"
 						multiple="false"
 						filter="CMD">
-						<!-- [11437] Option Set. -->
+						<!-- [11608] 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>
-					<!-- [11451] Number Field. Type: Text. (joomla) -->
+					<!-- [11622] 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"
 					/>
-					<!-- [11365] Year Field. Type: List. (joomla) -->
+					<!-- [11536] Year Field. Type: List. (joomla) -->
 					<field
 						type="list"
 						name="year"
@@ -702,7 +702,7 @@
 						class="list_class"
 						multiple="false"
 						filter="INT">
-						<!-- [11437] Option Set. -->
+						<!-- [11608] Option Set. -->
 						<option value="">
 							COM_COSTBENEFITPROJECTION_COUNTRY_SELECT_A_YEAR</option>
 						<option value="2010">
@@ -739,7 +739,7 @@
 				</fieldset>
 			</fields>
 		</field>
-		<!-- [11451] Healthcare Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11482] Femaleyld Field. Type: Repeatable. (joomla) -->
+		<!-- [11653] 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">
-					<!-- [11365] Age Field. Type: List. (joomla) -->
+					<!-- [11536] Age Field. Type: List. (joomla) -->
 					<field
 						type="list"
 						name="age"
@@ -776,7 +776,7 @@
 						class="list_class"
 						multiple="false"
 						filter="CMD">
-						<!-- [11437] Option Set. -->
+						<!-- [11608] 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>
-					<!-- [11451] Number Field. Type: Text. (joomla) -->
+					<!-- [11622] 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"
 					/>
-					<!-- [11365] Year Field. Type: List. (joomla) -->
+					<!-- [11536] Year Field. Type: List. (joomla) -->
 					<field
 						type="list"
 						name="year"
@@ -820,7 +820,7 @@
 						class="list_class"
 						multiple="false"
 						filter="INT">
-						<!-- [11437] Option Set. -->
+						<!-- [11608] Option Set. -->
 						<option value="">
 							COM_COSTBENEFITPROJECTION_COUNTRY_SELECT_A_YEAR</option>
 						<option value="2010">
@@ -859,15 +859,15 @@
 		</field>
 	</fieldset>
 	
-	<!-- [10138] Access Control Fields. -->
+	<!-- [10308] Access Control Fields. -->
 	<fieldset name="accesscontrol">
-		<!-- [10140] Asset Id Field. Type: Hidden (joomla) -->
+		<!-- [10310] Asset Id Field. Type: Hidden (joomla) -->
 		<field
 			name="asset_id"
 			type="hidden"
 			filter="unset"
 		/>
-		<!-- [10146] Rules Field. Type: Rules (joomla) -->
+		<!-- [10316] 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 7d98a6c6..db277943 100644
--- a/admin/models/forms/currency.js
+++ b/admin/models/forms/currency.js
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		currency.js
diff --git a/admin/models/forms/currency.xml b/admin/models/forms/currency.xml
index 4fea6732..793a7c15 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">
-		<!-- [11104] Default Fields. -->
-		<!-- [11105] Id Field. Type: Text (joomla) -->
+		<!-- [11275] Default Fields. -->
+		<!-- [11276] 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"
 		/>
-		<!-- [11112] Date Created Field. Type: Calendar (joomla) -->
+		<!-- [11283] 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"
 		/>
-		<!-- [11123] User Created Field. Type: User (joomla) -->
+		<!-- [11294] 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"
 		/>
-		<!-- [11131] Published Field. Type: List (joomla) -->
+		<!-- [11302] 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>
-		<!-- [11146] Date Modified Field. Type: Calendar (joomla) -->
+		<!-- [11317] 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" />
-		<!-- [11150] User Modified Field. Type: User (joomla) -->
+		<!-- [11321] User Modified Field. Type: User (joomla) -->
 		<field name="modified_by" type="user"
 			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
 			class="readonly"
 			readonly="true"
 			filter="unset"
 		/>
-		<!-- [11160] Access Field. Type: Accesslevel (joomla) -->
+		<!-- [11331] Access Field. Type: Accesslevel (joomla) -->
 		<field name="access"
 			type="accesslevel"
 			label="JFIELD_ACCESS_LABEL"
@@ -61,7 +61,7 @@
 			default="1"
 			required="false"
 		/>
-		<!-- [11170] Ordering Field. Type: Numbers (joomla) -->
+		<!-- [11341] Ordering Field. Type: Numbers (joomla) -->
 		<field
 			name="ordering"
 			type="number"
@@ -72,7 +72,7 @@
 			size="6"
 			required="false"
 		/>
-		<!-- [11182] Version Field. Type: Text (joomla) -->
+		<!-- [11353] Version Field. Type: Text (joomla) -->
 		<field
 			name="version"
 			type="text"
@@ -83,8 +83,8 @@
 			readonly="true"
 			filter="unset"
 		/>
-		<!-- [11215] Dynamic Fields. -->
-		<!-- [11451] Name Field. Type: Text. (joomla) -->
+		<!-- [11386] Dynamic Fields. -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11451] Codethree Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11451] Numericcode Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11451] Symbol Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11451] Alias Field. Type: Text. (joomla) -->
+		<!-- [11622] Alias Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="alias"
@@ -151,7 +151,7 @@
 			filter="STRING"
 			hint="COM_COSTBENEFITPROJECTION_CURRENCY_ALIAS_HINT"
 		/>
-		<!-- [11451] Positivestyle Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11451] Thousands Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11451] Decimalsymbol Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11451] Decimalplace Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11451] Negativestyle Field. Type: Text. (joomla) -->
+		<!-- [11622] Negativestyle Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="negativestyle"
@@ -221,15 +221,15 @@
 		/>
 	</fieldset>
 	
-	<!-- [10138] Access Control Fields. -->
+	<!-- [10308] Access Control Fields. -->
 	<fieldset name="accesscontrol">
-		<!-- [10140] Asset Id Field. Type: Hidden (joomla) -->
+		<!-- [10310] Asset Id Field. Type: Hidden (joomla) -->
 		<field
 			name="asset_id"
 			type="hidden"
 			filter="unset"
 		/>
-		<!-- [10146] Rules Field. Type: Rules (joomla) -->
+		<!-- [10316] 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 9eb1a238..9678ca22 100644
--- a/admin/models/forms/health_data.js
+++ b/admin/models/forms/health_data.js
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		health_data.js
diff --git a/admin/models/forms/health_data.xml b/admin/models/forms/health_data.xml
index c8cdfaae..f9ff5517 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">
-		<!-- [11104] Default Fields. -->
-		<!-- [11105] Id Field. Type: Text (joomla) -->
+		<!-- [11275] Default Fields. -->
+		<!-- [11276] 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"
 		/>
-		<!-- [11112] Date Created Field. Type: Calendar (joomla) -->
+		<!-- [11283] 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"
 		/>
-		<!-- [11123] User Created Field. Type: User (joomla) -->
+		<!-- [11294] 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"
 		/>
-		<!-- [11131] Published Field. Type: List (joomla) -->
+		<!-- [11302] 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>
-		<!-- [11146] Date Modified Field. Type: Calendar (joomla) -->
+		<!-- [11317] 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" />
-		<!-- [11150] User Modified Field. Type: User (joomla) -->
+		<!-- [11321] User Modified Field. Type: User (joomla) -->
 		<field name="modified_by" type="user"
 			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
 			class="readonly"
 			readonly="true"
 			filter="unset"
 		/>
-		<!-- [11160] Access Field. Type: Accesslevel (joomla) -->
+		<!-- [11331] Access Field. Type: Accesslevel (joomla) -->
 		<field name="access"
 			type="accesslevel"
 			label="JFIELD_ACCESS_LABEL"
@@ -61,7 +61,7 @@
 			default="1"
 			required="false"
 		/>
-		<!-- [11170] Ordering Field. Type: Numbers (joomla) -->
+		<!-- [11341] Ordering Field. Type: Numbers (joomla) -->
 		<field
 			name="ordering"
 			type="number"
@@ -72,7 +72,7 @@
 			size="6"
 			required="false"
 		/>
-		<!-- [11182] Version Field. Type: Text (joomla) -->
+		<!-- [11353] Version Field. Type: Text (joomla) -->
 		<field
 			name="version"
 			type="text"
@@ -83,8 +83,8 @@
 			readonly="true"
 			filter="unset"
 		/>
-		<!-- [11215] Dynamic Fields. -->
-		<!-- [11572] Causerisk Field. Type: Causesrisks. (custom) -->
+		<!-- [11386] Dynamic Fields. -->
+		<!-- [11743] Causerisk Field. Type: Causesrisks. (custom) -->
 		<field
 			type="causesrisks"
 			name="causerisk"
@@ -94,7 +94,7 @@
 			multiple="false"
 			default="0"
 		/>
-		<!-- [11365] Year Field. Type: List. (joomla) -->
+		<!-- [11536] Year Field. Type: List. (joomla) -->
 		<field
 			type="list"
 			name="year"
@@ -103,7 +103,7 @@
 			multiple="false"
 			filter="INT"
 			required="true">
-			<!-- [11437] Option Set. -->
+			<!-- [11608] 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>
-		<!-- [11572] Country Field. Type: Countries. (custom) -->
+		<!-- [11743] Country Field. Type: Countries. (custom) -->
 		<field
 			type="countries"
 			name="country"
@@ -148,7 +148,7 @@
 			default="0"
 			required="true"
 		/>
-		<!-- [11482] Femaledeath Field. Type: Repeatable. (joomla) -->
+		<!-- [11653] 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">
-					<!-- [11365] Age Field. Type: List. (joomla) -->
+					<!-- [11536] Age Field. Type: List. (joomla) -->
 					<field
 						type="list"
 						name="age"
@@ -169,7 +169,7 @@
 						class="list_class"
 						multiple="false"
 						filter="CMD">
-						<!-- [11437] Option Set. -->
+						<!-- [11608] 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>
-					<!-- [11451] Number Field. Type: Text. (joomla) -->
+					<!-- [11622] Number Field. Type: Text. (joomla) -->
 					<field
 						type="text"
 						name="number"
@@ -208,7 +208,7 @@
 				</fieldset>
 			</fields>
 		</field>
-		<!-- [11482] Maleyld Field. Type: Repeatable. (joomla) -->
+		<!-- [11653] 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">
-					<!-- [11365] Age Field. Type: List. (joomla) -->
+					<!-- [11536] Age Field. Type: List. (joomla) -->
 					<field
 						type="list"
 						name="age"
@@ -229,7 +229,7 @@
 						class="list_class"
 						multiple="false"
 						filter="CMD">
-						<!-- [11437] Option Set. -->
+						<!-- [11608] 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>
-					<!-- [11451] Number Field. Type: Text. (joomla) -->
+					<!-- [11622] Number Field. Type: Text. (joomla) -->
 					<field
 						type="text"
 						name="number"
@@ -268,7 +268,7 @@
 				</fieldset>
 			</fields>
 		</field>
-		<!-- [11482] Maledeath Field. Type: Repeatable. (joomla) -->
+		<!-- [11653] 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">
-					<!-- [11365] Age Field. Type: List. (joomla) -->
+					<!-- [11536] Age Field. Type: List. (joomla) -->
 					<field
 						type="list"
 						name="age"
@@ -289,7 +289,7 @@
 						class="list_class"
 						multiple="false"
 						filter="CMD">
-						<!-- [11437] Option Set. -->
+						<!-- [11608] 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>
-					<!-- [11451] Number Field. Type: Text. (joomla) -->
+					<!-- [11622] Number Field. Type: Text. (joomla) -->
 					<field
 						type="text"
 						name="number"
@@ -328,7 +328,7 @@
 				</fieldset>
 			</fields>
 		</field>
-		<!-- [11482] Femaleyld Field. Type: Repeatable. (joomla) -->
+		<!-- [11653] 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">
-					<!-- [11365] Age Field. Type: List. (joomla) -->
+					<!-- [11536] Age Field. Type: List. (joomla) -->
 					<field
 						type="list"
 						name="age"
@@ -349,7 +349,7 @@
 						class="list_class"
 						multiple="false"
 						filter="CMD">
-						<!-- [11437] Option Set. -->
+						<!-- [11608] 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>
-					<!-- [11451] Number Field. Type: Text. (joomla) -->
+					<!-- [11622] Number Field. Type: Text. (joomla) -->
 					<field
 						type="text"
 						name="number"
@@ -390,15 +390,15 @@
 		</field>
 	</fieldset>
 	
-	<!-- [10138] Access Control Fields. -->
+	<!-- [10308] Access Control Fields. -->
 	<fieldset name="accesscontrol">
-		<!-- [10140] Asset Id Field. Type: Hidden (joomla) -->
+		<!-- [10310] Asset Id Field. Type: Hidden (joomla) -->
 		<field
 			name="asset_id"
 			type="hidden"
 			filter="unset"
 		/>
-		<!-- [10146] Rules Field. Type: Rules (joomla) -->
+		<!-- [10316] 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 cbcd053f..c27773ea 100644
--- a/admin/models/forms/help_document.js
+++ b/admin/models/forms/help_document.js
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		help_document.js
@@ -17,38 +17,38 @@
 /------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_NdVMDpmmRb_required = false;
-jform_XRJJvwVycN_required = false;
-jform_VAWSUKAsmE_required = false;
-jform_VdAPKgebqU_required = false;
+jform_dzQOnAtTIF_required = false;
+jform_HWQwlmmxDJ_required = false;
+jform_fWSNxVStqV_required = false;
+jform_vpCnhLJvww_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var location_cxQpFiW = jQuery("#jform_location input[type='radio']:checked").val();
-	cxQpFiW(location_cxQpFiW);
+	var location_rjBFAdG = jQuery("#jform_location input[type='radio']:checked").val();
+	rjBFAdG(location_rjBFAdG);
 
-	var location_uMNxJWJ = jQuery("#jform_location input[type='radio']:checked").val();
-	uMNxJWJ(location_uMNxJWJ);
+	var location_tedcpcc = jQuery("#jform_location input[type='radio']:checked").val();
+	tedcpcc(location_tedcpcc);
 
-	var type_NdVMDpm = jQuery("#jform_type").val();
-	NdVMDpm(type_NdVMDpm);
+	var type_dzQOnAt = jQuery("#jform_type").val();
+	dzQOnAt(type_dzQOnAt);
 
-	var type_XRJJvwV = jQuery("#jform_type").val();
-	XRJJvwV(type_XRJJvwV);
+	var type_HWQwlmm = jQuery("#jform_type").val();
+	HWQwlmm(type_HWQwlmm);
 
-	var type_VAWSUKA = jQuery("#jform_type").val();
-	VAWSUKA(type_VAWSUKA);
+	var type_fWSNxVS = jQuery("#jform_type").val();
+	fWSNxVS(type_fWSNxVS);
 
-	var target_VdAPKge = jQuery("#jform_target input[type='radio']:checked").val();
-	VdAPKge(target_VdAPKge);
+	var target_vpCnhLJ = jQuery("#jform_target input[type='radio']:checked").val();
+	vpCnhLJ(target_vpCnhLJ);
 });
 
-// the cxQpFiW function
-function cxQpFiW(location_cxQpFiW)
+// the rjBFAdG function
+function rjBFAdG(location_rjBFAdG)
 {
-	// [8093] set the function logic
-	if (location_cxQpFiW == 1)
+	// [8260] set the function logic
+	if (location_rjBFAdG == 1)
 	{
 		jQuery('#jform_admin_view').closest('.control-group').show();
 	}
@@ -58,11 +58,11 @@ function cxQpFiW(location_cxQpFiW)
 	}
 }
 
-// the uMNxJWJ function
-function uMNxJWJ(location_uMNxJWJ)
+// the tedcpcc function
+function tedcpcc(location_tedcpcc)
 {
-	// [8093] set the function logic
-	if (location_uMNxJWJ == 2)
+	// [8260] set the function logic
+	if (location_tedcpcc == 2)
 	{
 		jQuery('#jform_site_view').closest('.control-group').show();
 	}
@@ -72,198 +72,198 @@ function uMNxJWJ(location_uMNxJWJ)
 	}
 }
 
-// the NdVMDpm function
-function NdVMDpm(type_NdVMDpm)
+// the dzQOnAt function
+function dzQOnAt(type_dzQOnAt)
 {
-	if (isSet(type_NdVMDpm) && type_NdVMDpm.constructor !== Array)
+	if (isSet(type_dzQOnAt) && type_dzQOnAt.constructor !== Array)
 	{
-		var temp_NdVMDpm = type_NdVMDpm;
-		var type_NdVMDpm = [];
-		type_NdVMDpm.push(temp_NdVMDpm);
+		var temp_dzQOnAt = type_dzQOnAt;
+		var type_dzQOnAt = [];
+		type_dzQOnAt.push(temp_dzQOnAt);
 	}
-	else if (!isSet(type_NdVMDpm))
+	else if (!isSet(type_dzQOnAt))
 	{
-		var type_NdVMDpm = [];
+		var type_dzQOnAt = [];
 	}
-	var type = type_NdVMDpm.some(type_NdVMDpm_SomeFunc);
+	var type = type_dzQOnAt.some(type_dzQOnAt_SomeFunc);
 
 
-	// [8071] set this function logic
+	// [8238] set this function logic
 	if (type)
 	{
 		jQuery('#jform_url').closest('.control-group').show();
-		if (jform_NdVMDpmmRb_required)
+		if (jform_dzQOnAtTIF_required)
 		{
 			updateFieldRequired('url',0);
 			jQuery('#jform_url').prop('required','required');
 			jQuery('#jform_url').attr('aria-required',true);
 			jQuery('#jform_url').addClass('required');
-			jform_NdVMDpmmRb_required = false;
+			jform_dzQOnAtTIF_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_url').closest('.control-group').hide();
-		if (!jform_NdVMDpmmRb_required)
+		if (!jform_dzQOnAtTIF_required)
 		{
 			updateFieldRequired('url',1);
 			jQuery('#jform_url').removeAttr('required');
 			jQuery('#jform_url').removeAttr('aria-required');
 			jQuery('#jform_url').removeClass('required');
-			jform_NdVMDpmmRb_required = true;
+			jform_dzQOnAtTIF_required = true;
 		}
 	}
 }
 
-// the NdVMDpm Some function
-function type_NdVMDpm_SomeFunc(type_NdVMDpm)
+// the dzQOnAt Some function
+function type_dzQOnAt_SomeFunc(type_dzQOnAt)
 {
-	// [8058] set the function logic
-	if (type_NdVMDpm == 3)
+	// [8225] set the function logic
+	if (type_dzQOnAt == 3)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the XRJJvwV function
-function XRJJvwV(type_XRJJvwV)
+// the HWQwlmm function
+function HWQwlmm(type_HWQwlmm)
 {
-	if (isSet(type_XRJJvwV) && type_XRJJvwV.constructor !== Array)
+	if (isSet(type_HWQwlmm) && type_HWQwlmm.constructor !== Array)
 	{
-		var temp_XRJJvwV = type_XRJJvwV;
-		var type_XRJJvwV = [];
-		type_XRJJvwV.push(temp_XRJJvwV);
+		var temp_HWQwlmm = type_HWQwlmm;
+		var type_HWQwlmm = [];
+		type_HWQwlmm.push(temp_HWQwlmm);
 	}
-	else if (!isSet(type_XRJJvwV))
+	else if (!isSet(type_HWQwlmm))
 	{
-		var type_XRJJvwV = [];
+		var type_HWQwlmm = [];
 	}
-	var type = type_XRJJvwV.some(type_XRJJvwV_SomeFunc);
+	var type = type_HWQwlmm.some(type_HWQwlmm_SomeFunc);
 
 
-	// [8071] set this function logic
+	// [8238] set this function logic
 	if (type)
 	{
 		jQuery('#jform_article').closest('.control-group').show();
-		if (jform_XRJJvwVycN_required)
+		if (jform_HWQwlmmxDJ_required)
 		{
 			updateFieldRequired('article',0);
 			jQuery('#jform_article').prop('required','required');
 			jQuery('#jform_article').attr('aria-required',true);
 			jQuery('#jform_article').addClass('required');
-			jform_XRJJvwVycN_required = false;
+			jform_HWQwlmmxDJ_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_article').closest('.control-group').hide();
-		if (!jform_XRJJvwVycN_required)
+		if (!jform_HWQwlmmxDJ_required)
 		{
 			updateFieldRequired('article',1);
 			jQuery('#jform_article').removeAttr('required');
 			jQuery('#jform_article').removeAttr('aria-required');
 			jQuery('#jform_article').removeClass('required');
-			jform_XRJJvwVycN_required = true;
+			jform_HWQwlmmxDJ_required = true;
 		}
 	}
 }
 
-// the XRJJvwV Some function
-function type_XRJJvwV_SomeFunc(type_XRJJvwV)
+// the HWQwlmm Some function
+function type_HWQwlmm_SomeFunc(type_HWQwlmm)
 {
-	// [8058] set the function logic
-	if (type_XRJJvwV == 1)
+	// [8225] set the function logic
+	if (type_HWQwlmm == 1)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the VAWSUKA function
-function VAWSUKA(type_VAWSUKA)
+// the fWSNxVS function
+function fWSNxVS(type_fWSNxVS)
 {
-	if (isSet(type_VAWSUKA) && type_VAWSUKA.constructor !== Array)
+	if (isSet(type_fWSNxVS) && type_fWSNxVS.constructor !== Array)
 	{
-		var temp_VAWSUKA = type_VAWSUKA;
-		var type_VAWSUKA = [];
-		type_VAWSUKA.push(temp_VAWSUKA);
+		var temp_fWSNxVS = type_fWSNxVS;
+		var type_fWSNxVS = [];
+		type_fWSNxVS.push(temp_fWSNxVS);
 	}
-	else if (!isSet(type_VAWSUKA))
+	else if (!isSet(type_fWSNxVS))
 	{
-		var type_VAWSUKA = [];
+		var type_fWSNxVS = [];
 	}
-	var type = type_VAWSUKA.some(type_VAWSUKA_SomeFunc);
+	var type = type_fWSNxVS.some(type_fWSNxVS_SomeFunc);
 
 
-	// [8071] set this function logic
+	// [8238] set this function logic
 	if (type)
 	{
 		jQuery('#jform_content-lbl').closest('.control-group').show();
-		if (jform_VAWSUKAsmE_required)
+		if (jform_fWSNxVStqV_required)
 		{
 			updateFieldRequired('content',0);
 			jQuery('#jform_content').prop('required','required');
 			jQuery('#jform_content').attr('aria-required',true);
 			jQuery('#jform_content').addClass('required');
-			jform_VAWSUKAsmE_required = false;
+			jform_fWSNxVStqV_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_content-lbl').closest('.control-group').hide();
-		if (!jform_VAWSUKAsmE_required)
+		if (!jform_fWSNxVStqV_required)
 		{
 			updateFieldRequired('content',1);
 			jQuery('#jform_content').removeAttr('required');
 			jQuery('#jform_content').removeAttr('aria-required');
 			jQuery('#jform_content').removeClass('required');
-			jform_VAWSUKAsmE_required = true;
+			jform_fWSNxVStqV_required = true;
 		}
 	}
 }
 
-// the VAWSUKA Some function
-function type_VAWSUKA_SomeFunc(type_VAWSUKA)
+// the fWSNxVS Some function
+function type_fWSNxVS_SomeFunc(type_fWSNxVS)
 {
-	// [8058] set the function logic
-	if (type_VAWSUKA == 2)
+	// [8225] set the function logic
+	if (type_fWSNxVS == 2)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the VdAPKge function
-function VdAPKge(target_VdAPKge)
+// the vpCnhLJ function
+function vpCnhLJ(target_vpCnhLJ)
 {
-	// [8093] set the function logic
-	if (target_VdAPKge == 1)
+	// [8260] set the function logic
+	if (target_vpCnhLJ == 1)
 	{
 		jQuery('#jform_groups').closest('.control-group').show();
-		if (jform_VdAPKgebqU_required)
+		if (jform_vpCnhLJvww_required)
 		{
 			updateFieldRequired('groups',0);
 			jQuery('#jform_groups').prop('required','required');
 			jQuery('#jform_groups').attr('aria-required',true);
 			jQuery('#jform_groups').addClass('required');
-			jform_VdAPKgebqU_required = false;
+			jform_vpCnhLJvww_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_groups').closest('.control-group').hide();
-		if (!jform_VdAPKgebqU_required)
+		if (!jform_vpCnhLJvww_required)
 		{
 			updateFieldRequired('groups',1);
 			jQuery('#jform_groups').removeAttr('required');
 			jQuery('#jform_groups').removeAttr('aria-required');
 			jQuery('#jform_groups').removeClass('required');
-			jform_VdAPKgebqU_required = true;
+			jform_vpCnhLJvww_required = true;
 		}
 	}
 }
diff --git a/admin/models/forms/help_document.xml b/admin/models/forms/help_document.xml
index 84c24d77..3cad4d7b 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">
-		<!-- [11104] Default Fields. -->
-		<!-- [11105] Id Field. Type: Text (joomla) -->
+		<!-- [11275] Default Fields. -->
+		<!-- [11276] 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"
 		/>
-		<!-- [11112] Date Created Field. Type: Calendar (joomla) -->
+		<!-- [11283] 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"
 		/>
-		<!-- [11123] User Created Field. Type: User (joomla) -->
+		<!-- [11294] 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"
 		/>
-		<!-- [11131] Published Field. Type: List (joomla) -->
+		<!-- [11302] 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>
-		<!-- [11146] Date Modified Field. Type: Calendar (joomla) -->
+		<!-- [11317] 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" />
-		<!-- [11150] User Modified Field. Type: User (joomla) -->
+		<!-- [11321] User Modified Field. Type: User (joomla) -->
 		<field name="modified_by" type="user"
 			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
 			class="readonly"
 			readonly="true"
 			filter="unset"
 		/>
-		<!-- [11170] Ordering Field. Type: Numbers (joomla) -->
+		<!-- [11341] Ordering Field. Type: Numbers (joomla) -->
 		<field
 			name="ordering"
 			type="number"
@@ -64,7 +64,7 @@
 			size="6"
 			required="false"
 		/>
-		<!-- [11182] Version Field. Type: Text (joomla) -->
+		<!-- [11353] Version Field. Type: Text (joomla) -->
 		<field
 			name="version"
 			type="text"
@@ -75,8 +75,8 @@
 			readonly="true"
 			filter="unset"
 		/>
-		<!-- [11215] Dynamic Fields. -->
-		<!-- [11451] Title Field. Type: Text. (joomla) -->
+		<!-- [11386] Dynamic Fields. -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11365] Type Field. Type: List. (joomla) -->
+		<!-- [11536] Type Field. Type: List. (joomla) -->
 		<field
 			type="list"
 			name="type"
@@ -101,7 +101,7 @@
 			class="list_class"
 			multiple="false"
 			required="true">
-			<!-- [11437] Option Set. -->
+			<!-- [11608] 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>
-		<!-- [11451] Groups Field. Type: Usergroup. (joomla) -->
+		<!-- [11622] Groups Field. Type: Usergroup. (joomla) -->
 		<field
 			type="usergroup"
 			name="groups"
@@ -120,7 +120,7 @@
 			required="true"
 			multiple="true"
 		/>
-		<!-- [11365] Location Field. Type: Radio. (joomla) -->
+		<!-- [11536] 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">
-			<!-- [11437] Option Set. -->
+			<!-- [11608] Option Set. -->
 			<option value="1">
 				COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_ADMIN</option>
 			<option value="2">
 				COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_SITE</option>
 		</field>
-		<!-- [11451] Admin_view Field. Type: Folderlist. (joomla) -->
+		<!-- [11622] Admin_view Field. Type: Folderlist. (joomla) -->
 		<field
 			type="folderlist"
 			name="admin_view"
@@ -144,7 +144,7 @@
 			hide_none="true"
 			hide_default="true"
 		/>
-		<!-- [11451] Site_view Field. Type: Folderlist. (joomla) -->
+		<!-- [11622] Site_view Field. Type: Folderlist. (joomla) -->
 		<field
 			type="folderlist"
 			name="site_view"
@@ -154,7 +154,7 @@
 			hide_none="true"
 			hide_default="true"
 		/>
-		<!-- [11365] Target Field. Type: Radio. (joomla) -->
+		<!-- [11536] 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">
-			<!-- [11437] Option Set. -->
+			<!-- [11608] Option Set. -->
 			<option value="1">
 				COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_SOME</option>
 			<option value="2">
 				COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_ALL</option>
 		</field>
-		<!-- [11451] Content Field. Type: Editor. (joomla) -->
+		<!-- [11622] Content Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
 			name="content"
@@ -179,7 +179,7 @@
 			filter="safehtml"
 			required="true"
 		/>
-		<!-- [11451] Alias Field. Type: Text. (joomla) -->
+		<!-- [11622] Alias Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="alias"
@@ -188,7 +188,7 @@
 			filter="STRING"
 			hint="COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_ALIAS_HINT"
 		/>
-		<!-- [11572] Article Field. Type: Articles. (custom) -->
+		<!-- [11743] Article Field. Type: Articles. (custom) -->
 		<field
 			type="articles"
 			name="article"
@@ -198,7 +198,7 @@
 			default="0"
 			required="true"
 		/>
-		<!-- [11451] Url Field. Type: Url. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11451] Not_required Field. Type: Hidden. (joomla) -->
+		<!-- [11622] Not_required Field. Type: Hidden. (joomla) -->
 		<field
 			type="hidden"
 			name="not_required"
@@ -221,15 +221,15 @@
 		/>
 	</fieldset>
 	
-	<!-- [10138] Access Control Fields. -->
+	<!-- [10308] Access Control Fields. -->
 	<fieldset name="accesscontrol">
-		<!-- [10140] Asset Id Field. Type: Hidden (joomla) -->
+		<!-- [10310] Asset Id Field. Type: Hidden (joomla) -->
 		<field
 			name="asset_id"
 			type="hidden"
 			filter="unset"
 		/>
-		<!-- [10146] Rules Field. Type: Rules (joomla) -->
+		<!-- [10316] 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 c13a8e6a..af9b6a7b 100644
--- a/admin/models/forms/intervention.js
+++ b/admin/models/forms/intervention.js
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		intervention.js
@@ -17,54 +17,54 @@
 /------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_hhqVuoHOHO_required = false;
+jform_JxOMJHDKko_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var type_hhqVuoH = jQuery("#jform_type input[type='radio']:checked").val();
-	hhqVuoH(type_hhqVuoH);
+	var type_JxOMJHD = jQuery("#jform_type input[type='radio']:checked").val();
+	JxOMJHD(type_JxOMJHD);
 
-	var type_LZHLLUr = jQuery("#jform_type input[type='radio']:checked").val();
-	LZHLLUr(type_LZHLLUr);
+	var type_SnkLovW = jQuery("#jform_type input[type='radio']:checked").val();
+	SnkLovW(type_SnkLovW);
 });
 
-// the hhqVuoH function
-function hhqVuoH(type_hhqVuoH)
+// the JxOMJHD function
+function JxOMJHD(type_JxOMJHD)
 {
-	// [8093] set the function logic
-	if (type_hhqVuoH == 2)
+	// [8260] set the function logic
+	if (type_JxOMJHD == 2)
 	{
 		jQuery('#jform_interventions').closest('.control-group').show();
-		if (jform_hhqVuoHOHO_required)
+		if (jform_JxOMJHDKko_required)
 		{
 			updateFieldRequired('interventions',0);
 			jQuery('#jform_interventions').prop('required','required');
 			jQuery('#jform_interventions').attr('aria-required',true);
 			jQuery('#jform_interventions').addClass('required');
-			jform_hhqVuoHOHO_required = false;
+			jform_JxOMJHDKko_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_interventions').closest('.control-group').hide();
-		if (!jform_hhqVuoHOHO_required)
+		if (!jform_JxOMJHDKko_required)
 		{
 			updateFieldRequired('interventions',1);
 			jQuery('#jform_interventions').removeAttr('required');
 			jQuery('#jform_interventions').removeAttr('aria-required');
 			jQuery('#jform_interventions').removeClass('required');
-			jform_hhqVuoHOHO_required = true;
+			jform_JxOMJHDKko_required = true;
 		}
 	}
 }
 
-// the LZHLLUr function
-function LZHLLUr(type_LZHLLUr)
+// the SnkLovW function
+function SnkLovW(type_SnkLovW)
 {
-	// [8093] set the function logic
-	if (type_LZHLLUr == 1)
+	// [8260] set the function logic
+	if (type_SnkLovW == 1)
 	{
 		jQuery('#jform_intervention').closest('.control-group').show();
 	}
diff --git a/admin/models/forms/intervention.xml b/admin/models/forms/intervention.xml
index 14fe6a80..0326ddcd 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">
-		<!-- [11104] Default Fields. -->
-		<!-- [11105] Id Field. Type: Text (joomla) -->
+		<!-- [11275] Default Fields. -->
+		<!-- [11276] 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"
 		/>
-		<!-- [11112] Date Created Field. Type: Calendar (joomla) -->
+		<!-- [11283] 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"
 		/>
-		<!-- [11123] User Created Field. Type: User (joomla) -->
+		<!-- [11294] 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"
 		/>
-		<!-- [11131] Published Field. Type: List (joomla) -->
+		<!-- [11302] 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>
-		<!-- [11146] Date Modified Field. Type: Calendar (joomla) -->
+		<!-- [11317] 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" />
-		<!-- [11150] User Modified Field. Type: User (joomla) -->
+		<!-- [11321] User Modified Field. Type: User (joomla) -->
 		<field name="modified_by" type="user"
 			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
 			class="readonly"
 			readonly="true"
 			filter="unset"
 		/>
-		<!-- [11170] Ordering Field. Type: Numbers (joomla) -->
+		<!-- [11341] Ordering Field. Type: Numbers (joomla) -->
 		<field
 			name="ordering"
 			type="number"
@@ -64,7 +64,7 @@
 			size="6"
 			required="false"
 		/>
-		<!-- [11182] Version Field. Type: Text (joomla) -->
+		<!-- [11353] Version Field. Type: Text (joomla) -->
 		<field
 			name="version"
 			type="text"
@@ -75,8 +75,8 @@
 			readonly="true"
 			filter="unset"
 		/>
-		<!-- [11215] Dynamic Fields. -->
-		<!-- [11451] Name Field. Type: Text. (joomla) -->
+		<!-- [11386] Dynamic Fields. -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11572] Company Field. Type: Company. (custom) -->
+		<!-- [11743] Company Field. Type: Company. (custom) -->
 		<field
 			type="company"
 			name="company"
@@ -102,7 +102,7 @@
 			default="0"
 			button="true"
 		/>
-		<!-- [11365] Type Field. Type: Radio. (joomla) -->
+		<!-- [11536] Type Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
 			name="type"
@@ -111,13 +111,13 @@
 			class="btn-group"
 			default="1"
 			required="true">
-			<!-- [11437] Option Set. -->
+			<!-- [11608] Option Set. -->
 			<option value="1">
 				COM_COSTBENEFITPROJECTION_INTERVENTION_SINGLE</option>
 			<option value="2">
 				COM_COSTBENEFITPROJECTION_INTERVENTION_CLUSTER</option>
 		</field>
-		<!-- [11451] Coverage Field. Type: Integer. (joomla) -->
+		<!-- [11622] Coverage Field. Type: Integer. (joomla) -->
 		<field
 			type="integer"
 			name="coverage"
@@ -128,7 +128,7 @@
 			last="100"
 			step="10"
 		/>
-		<!-- [11451] Duration Field. Type: Integer. (joomla) -->
+		<!-- [11622] Duration Field. Type: Integer. (joomla) -->
 		<field
 			type="integer"
 			name="duration"
@@ -140,7 +140,7 @@
 			last="20"
 			step="1"
 		/>
-		<!-- [11451] Description Field. Type: Textarea. (joomla) -->
+		<!-- [11622] Description Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
 			name="description"
@@ -152,7 +152,7 @@
 			filter="HTML"
 			hint="COM_COSTBENEFITPROJECTION_INTERVENTION_DESCRIPTION_HINT"
 		/>
-		<!-- [11482] Intervention Field. Type: Repeatable. (joomla) -->
+		<!-- [11653] 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">
-					<!-- [11572] Causerisk Field. Type: Causesrisks. (custom) -->
+					<!-- [11743] Causerisk Field. Type: Causesrisks. (custom) -->
 					<field
 						type="causesrisks"
 						name="causerisk"
@@ -175,7 +175,7 @@
 						default="0"
 						button="false"
 					/>
-					<!-- [11451] Cpe Field. Type: Text. (joomla) -->
+					<!-- [11622] Cpe Field. Type: Text. (joomla) -->
 					<field
 						type="text"
 						name="cpe"
@@ -186,7 +186,7 @@
 						class="text_area"
 						filter="INT"
 					/>
-					<!-- [11451] Mbr Field. Type: Text. (joomla) -->
+					<!-- [11622] Mbr Field. Type: Text. (joomla) -->
 					<field
 						type="text"
 						name="mbr"
@@ -197,7 +197,7 @@
 						class="text_area"
 						filter="INT"
 					/>
-					<!-- [11451] Mtr Field. Type: Text. (joomla) -->
+					<!-- [11622] Mtr Field. Type: Text. (joomla) -->
 					<field
 						type="text"
 						name="mtr"
@@ -211,7 +211,7 @@
 				</fieldset>
 			</fields>
 		</field>
-		<!-- [11451] Reference Field. Type: Textarea. (joomla) -->
+		<!-- [11622] Reference Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
 			name="reference"
@@ -223,7 +223,7 @@
 			filter="HTML"
 			hint="COM_COSTBENEFITPROJECTION_INTERVENTION_REFERENCE_HINT"
 		/>
-		<!-- [11572] Interventions Field. Type: Interventions. (custom) -->
+		<!-- [11743] Interventions Field. Type: Interventions. (custom) -->
 		<field
 			type="interventions"
 			name="interventions"
@@ -233,7 +233,7 @@
 			required="true"
 			button="false"
 		/>
-		<!-- [11365] Share Field. Type: List. (joomla) -->
+		<!-- [11536] Share Field. Type: List. (joomla) -->
 		<field
 			type="list"
 			name="share"
@@ -244,7 +244,7 @@
 			filter="INT"
 			required="true"
 			default="3">
-			<!-- [11437] Option Set. -->
+			<!-- [11608] 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>
-		<!-- [11451] Not_required Field. Type: Hidden. (joomla) -->
+		<!-- [11622] Not_required Field. Type: Hidden. (joomla) -->
 		<field
 			type="hidden"
 			name="not_required"
@@ -260,15 +260,15 @@
 		/>
 	</fieldset>
 	
-	<!-- [10138] Access Control Fields. -->
+	<!-- [10308] Access Control Fields. -->
 	<fieldset name="accesscontrol">
-		<!-- [10140] Asset Id Field. Type: Hidden (joomla) -->
+		<!-- [10310] Asset Id Field. Type: Hidden (joomla) -->
 		<field
 			name="asset_id"
 			type="hidden"
 			filter="unset"
 		/>
-		<!-- [10146] Rules Field. Type: Rules (joomla) -->
+		<!-- [10316] 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 605af7aa..24e5ae6f 100644
--- a/admin/models/forms/scaling_factor.js
+++ b/admin/models/forms/scaling_factor.js
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		scaling_factor.js
diff --git a/admin/models/forms/scaling_factor.xml b/admin/models/forms/scaling_factor.xml
index b7f23b23..7457ed01 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">
-		<!-- [11104] Default Fields. -->
-		<!-- [11105] Id Field. Type: Text (joomla) -->
+		<!-- [11275] Default Fields. -->
+		<!-- [11276] 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"
 		/>
-		<!-- [11112] Date Created Field. Type: Calendar (joomla) -->
+		<!-- [11283] 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"
 		/>
-		<!-- [11123] User Created Field. Type: User (joomla) -->
+		<!-- [11294] 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"
 		/>
-		<!-- [11131] Published Field. Type: List (joomla) -->
+		<!-- [11302] 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>
-		<!-- [11146] Date Modified Field. Type: Calendar (joomla) -->
+		<!-- [11317] 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" />
-		<!-- [11150] User Modified Field. Type: User (joomla) -->
+		<!-- [11321] User Modified Field. Type: User (joomla) -->
 		<field name="modified_by" type="user"
 			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
 			class="readonly"
 			readonly="true"
 			filter="unset"
 		/>
-		<!-- [11170] Ordering Field. Type: Numbers (joomla) -->
+		<!-- [11341] Ordering Field. Type: Numbers (joomla) -->
 		<field
 			name="ordering"
 			type="number"
@@ -64,7 +64,7 @@
 			size="6"
 			required="false"
 		/>
-		<!-- [11182] Version Field. Type: Text (joomla) -->
+		<!-- [11353] Version Field. Type: Text (joomla) -->
 		<field
 			name="version"
 			type="text"
@@ -75,8 +75,8 @@
 			readonly="true"
 			filter="unset"
 		/>
-		<!-- [11215] Dynamic Fields. -->
-		<!-- [11572] Causerisk Field. Type: Causesrisks. (custom) -->
+		<!-- [11386] Dynamic Fields. -->
+		<!-- [11743] Causerisk Field. Type: Causesrisks. (custom) -->
 		<field
 			type="causesrisks"
 			name="causerisk"
@@ -86,7 +86,7 @@
 			multiple="false"
 			default="0"
 		/>
-		<!-- [11572] Company Field. Type: Company. (custom) -->
+		<!-- [11743] Company Field. Type: Company. (custom) -->
 		<field
 			type="company"
 			name="company"
@@ -96,7 +96,7 @@
 			default="0"
 			button="true"
 		/>
-		<!-- [11451] Reference Field. Type: Textarea. (joomla) -->
+		<!-- [11622] Reference Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
 			name="reference"
@@ -108,7 +108,7 @@
 			filter="HTML"
 			hint="COM_COSTBENEFITPROJECTION_SCALING_FACTOR_REFERENCE_HINT"
 		/>
-		<!-- [11451] Yld_scaling_factor_males Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11451] Yld_scaling_factor_females Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11451] Mortality_scaling_factor_males Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11451] Mortality_scaling_factor_females Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11451] Presenteeism_scaling_factor_males Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11451] Presenteeism_scaling_factor_females Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11451] Health_scaling_factor Field. Type: Text. (joomla) -->
+		<!-- [11622] Health_scaling_factor Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="health_scaling_factor"
@@ -229,15 +229,15 @@
 		/>
 	</fieldset>
 	
-	<!-- [10138] Access Control Fields. -->
+	<!-- [10308] Access Control Fields. -->
 	<fieldset name="accesscontrol">
-		<!-- [10140] Asset Id Field. Type: Hidden (joomla) -->
+		<!-- [10310] Asset Id Field. Type: Hidden (joomla) -->
 		<field
 			name="asset_id"
 			type="hidden"
 			filter="unset"
 		/>
-		<!-- [10146] Rules Field. Type: Rules (joomla) -->
+		<!-- [10316] 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 2c7b4bd1..be3cc456 100644
--- a/admin/models/forms/service_provider.js
+++ b/admin/models/forms/service_provider.js
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		service_provider.js
diff --git a/admin/models/forms/service_provider.xml b/admin/models/forms/service_provider.xml
index ebf38698..335e077a 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">
-		<!-- [11104] Default Fields. -->
-		<!-- [11105] Id Field. Type: Text (joomla) -->
+		<!-- [11275] Default Fields. -->
+		<!-- [11276] 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"
 		/>
-		<!-- [11112] Date Created Field. Type: Calendar (joomla) -->
+		<!-- [11283] 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"
 		/>
-		<!-- [11123] User Created Field. Type: User (joomla) -->
+		<!-- [11294] 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"
 		/>
-		<!-- [11131] Published Field. Type: List (joomla) -->
+		<!-- [11302] 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>
-		<!-- [11146] Date Modified Field. Type: Calendar (joomla) -->
+		<!-- [11317] 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" />
-		<!-- [11150] User Modified Field. Type: User (joomla) -->
+		<!-- [11321] User Modified Field. Type: User (joomla) -->
 		<field name="modified_by" type="user"
 			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
 			class="readonly"
 			readonly="true"
 			filter="unset"
 		/>
-		<!-- [11170] Ordering Field. Type: Numbers (joomla) -->
+		<!-- [11341] Ordering Field. Type: Numbers (joomla) -->
 		<field
 			name="ordering"
 			type="number"
@@ -64,7 +64,7 @@
 			size="6"
 			required="false"
 		/>
-		<!-- [11182] Version Field. Type: Text (joomla) -->
+		<!-- [11353] Version Field. Type: Text (joomla) -->
 		<field
 			name="version"
 			type="text"
@@ -75,8 +75,8 @@
 			readonly="true"
 			filter="unset"
 		/>
-		<!-- [11215] Dynamic Fields. -->
-		<!-- [11572] User Field. Type: Serviceprovideruser. (custom) -->
+		<!-- [11386] Dynamic Fields. -->
+		<!-- [11743] 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"
 		/>
-		<!-- [11572] Country Field. Type: Countries. (custom) -->
+		<!-- [11743] Country Field. Type: Countries. (custom) -->
 		<field
 			type="countries"
 			name="country"
@@ -95,7 +95,7 @@
 			default="0"
 			required="true"
 		/>
-		<!-- [11451] Publicname Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11451] Publicemail Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11451] Publicnumber Field. Type: Tel. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11451] Publicaddress Field. Type: Editor. (joomla) -->
+		<!-- [11622] Publicaddress Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
 			name="publicaddress"
@@ -148,19 +148,19 @@
 			buttons="false"
 			filter="safehtml"
 		/>
-		<!-- [11465] Public_details_note Field. Type: Note. A None Database Field. (joomla) -->
+		<!-- [11636] 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>
 	
-	<!-- [10138] Access Control Fields. -->
+	<!-- [10308] Access Control Fields. -->
 	<fieldset name="accesscontrol">
-		<!-- [10140] Asset Id Field. Type: Hidden (joomla) -->
+		<!-- [10310] Asset Id Field. Type: Hidden (joomla) -->
 		<field
 			name="asset_id"
 			type="hidden"
 			filter="unset"
 		/>
-		<!-- [10146] Rules Field. Type: Rules (joomla) -->
+		<!-- [10316] 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 78606fad..b003fc1a 100644
--- a/admin/models/health_data.php
+++ b/admin/models/health_data.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		health_data.php
@@ -110,7 +110,7 @@ class CostbenefitprojectionModelHealth_data extends JModelAdmin
 	 * @since   1.6
 	 */
 	public function getForm($data = array(), $loadData = true)
-	{		// [9651] Get the form.
+	{		// [9818] 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;
 
-		// [9736] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first.
+		// [9903] 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');
 		}
-		// [9741] The back end uses id so we use that the rest of the time and set it to 0 by default.
+		// [9908] 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();
 
-		// [9747] Check for existing item.
-		// [9748] Modify the form based on Edit State access controls.
+		// [9914] Check for existing item.
+		// [9915] 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')))
 		{
-			// [9761] Disable fields for display.
+			// [9928] Disable fields for display.
 			$form->setFieldAttribute('ordering', 'disabled', 'true');
 			$form->setFieldAttribute('published', 'disabled', 'true');
-			// [9764] Disable fields while saving.
+			// [9931] Disable fields while saving.
 			$form->setFieldAttribute('ordering', 'filter', 'unset');
 			$form->setFieldAttribute('published', 'filter', 'unset');
 		}
-		// [9769] Modify the form based on Edit Creaded By access controls.
+		// [9936] Modify the form based on Edit Creaded By access controls.
 		if (!$user->authorise('core.edit.created_by', 'com_costbenefitprojection'))
 		{
-			// [9781] Disable fields for display.
+			// [9948] Disable fields for display.
 			$form->setFieldAttribute('created_by', 'disabled', 'true');
-			// [9783] Disable fields for display.
+			// [9950] Disable fields for display.
 			$form->setFieldAttribute('created_by', 'readonly', 'true');
-			// [9785] Disable fields while saving.
+			// [9952] Disable fields while saving.
 			$form->setFieldAttribute('created_by', 'filter', 'unset');
 		}
-		// [9788] Modify the form based on Edit Creaded Date access controls.
+		// [9955] Modify the form based on Edit Creaded Date access controls.
 		if (!$user->authorise('core.edit.created', 'com_costbenefitprojection'))
 		{
-			// [9800] Disable fields for display.
+			// [9967] Disable fields for display.
 			$form->setFieldAttribute('created', 'disabled', 'true');
-			// [9802] Disable fields while saving.
+			// [9969] Disable fields while saving.
 			$form->setFieldAttribute('created', 'filter', 'unset');
 		}
-		// [9810] Modify the form based on Edit Causerisk access controls.
+		// [9977] 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')))
 		{
-			// [9814] Disable fields for display.
+			// [9981] Disable fields for display.
 			$form->setFieldAttribute('causerisk', 'disabled', 'true');
-			// [9816] Disable fields for display.
+			// [9983] Disable fields for display.
 			$form->setFieldAttribute('causerisk', 'readonly', 'true');
 			if (!$form->getValue('causerisk'))
 			{
-				// [9826] Disable fields while saving.
+				// [9993] Disable fields while saving.
 				$form->setFieldAttribute('causerisk', 'filter', 'unset');
-				// [9828] Disable fields while saving.
+				// [9995] Disable fields while saving.
 				$form->setFieldAttribute('causerisk', 'required', 'false');
 			}
 		}
-		// [9810] Modify the form based on Edit Year access controls.
+		// [9977] 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')))
 		{
-			// [9814] Disable fields for display.
+			// [9981] Disable fields for display.
 			$form->setFieldAttribute('year', 'disabled', 'true');
-			// [9816] Disable fields for display.
+			// [9983] Disable fields for display.
 			$form->setFieldAttribute('year', 'readonly', 'true');
 			if (!$form->getValue('year'))
 			{
-				// [9826] Disable fields while saving.
+				// [9993] Disable fields while saving.
 				$form->setFieldAttribute('year', 'filter', 'unset');
-				// [9828] Disable fields while saving.
+				// [9995] Disable fields while saving.
 				$form->setFieldAttribute('year', 'required', 'false');
 			}
 		}
-		// [9810] Modify the form based on Edit Country access controls.
+		// [9977] 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')))
 		{
-			// [9814] Disable fields for display.
+			// [9981] Disable fields for display.
 			$form->setFieldAttribute('country', 'disabled', 'true');
-			// [9816] Disable fields for display.
+			// [9983] Disable fields for display.
 			$form->setFieldAttribute('country', 'readonly', 'true');
 			if (!$form->getValue('country'))
 			{
-				// [9826] Disable fields while saving.
+				// [9993] Disable fields while saving.
 				$form->setFieldAttribute('country', 'filter', 'unset');
-				// [9828] Disable fields while saving.
+				// [9995] Disable fields while saving.
 				$form->setFieldAttribute('country', 'required', 'false');
 			}
 		}
-		// [9810] Modify the form based on Edit Femaledeath access controls.
+		// [9977] 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')))
 		{
-			// [9814] Disable fields for display.
+			// [9981] Disable fields for display.
 			$form->setFieldAttribute('femaledeath', 'disabled', 'true');
-			// [9816] Disable fields for display.
+			// [9983] Disable fields for display.
 			$form->setFieldAttribute('femaledeath', 'readonly', 'true');
-			// [9820] Disable radio button for display.
+			// [9987] Disable radio button for display.
 			$class = $form->getFieldAttribute('femaledeath', 'class', '');
 			$form->setFieldAttribute('femaledeath', 'class', $class.' disabled no-click');
 			if (!$form->getValue('femaledeath'))
 			{
-				// [9826] Disable fields while saving.
+				// [9993] Disable fields while saving.
 				$form->setFieldAttribute('femaledeath', 'filter', 'unset');
-				// [9828] Disable fields while saving.
+				// [9995] Disable fields while saving.
 				$form->setFieldAttribute('femaledeath', 'required', 'false');
 			}
 		}
-		// [9810] Modify the form based on Edit Maleyld access controls.
+		// [9977] 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')))
 		{
-			// [9814] Disable fields for display.
+			// [9981] Disable fields for display.
 			$form->setFieldAttribute('maleyld', 'disabled', 'true');
-			// [9816] Disable fields for display.
+			// [9983] Disable fields for display.
 			$form->setFieldAttribute('maleyld', 'readonly', 'true');
-			// [9820] Disable radio button for display.
+			// [9987] Disable radio button for display.
 			$class = $form->getFieldAttribute('maleyld', 'class', '');
 			$form->setFieldAttribute('maleyld', 'class', $class.' disabled no-click');
 			if (!$form->getValue('maleyld'))
 			{
-				// [9826] Disable fields while saving.
+				// [9993] Disable fields while saving.
 				$form->setFieldAttribute('maleyld', 'filter', 'unset');
-				// [9828] Disable fields while saving.
+				// [9995] Disable fields while saving.
 				$form->setFieldAttribute('maleyld', 'required', 'false');
 			}
 		}
-		// [9810] Modify the form based on Edit Maledeath access controls.
+		// [9977] 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')))
 		{
-			// [9814] Disable fields for display.
+			// [9981] Disable fields for display.
 			$form->setFieldAttribute('maledeath', 'disabled', 'true');
-			// [9816] Disable fields for display.
+			// [9983] Disable fields for display.
 			$form->setFieldAttribute('maledeath', 'readonly', 'true');
-			// [9820] Disable radio button for display.
+			// [9987] Disable radio button for display.
 			$class = $form->getFieldAttribute('maledeath', 'class', '');
 			$form->setFieldAttribute('maledeath', 'class', $class.' disabled no-click');
 			if (!$form->getValue('maledeath'))
 			{
-				// [9826] Disable fields while saving.
+				// [9993] Disable fields while saving.
 				$form->setFieldAttribute('maledeath', 'filter', 'unset');
-				// [9828] Disable fields while saving.
+				// [9995] Disable fields while saving.
 				$form->setFieldAttribute('maledeath', 'required', 'false');
 			}
 		}
-		// [9810] Modify the form based on Edit Femaleyld access controls.
+		// [9977] 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')))
 		{
-			// [9814] Disable fields for display.
+			// [9981] Disable fields for display.
 			$form->setFieldAttribute('femaleyld', 'disabled', 'true');
-			// [9816] Disable fields for display.
+			// [9983] Disable fields for display.
 			$form->setFieldAttribute('femaleyld', 'readonly', 'true');
-			// [9820] Disable radio button for display.
+			// [9987] Disable radio button for display.
 			$class = $form->getFieldAttribute('femaleyld', 'class', '');
 			$form->setFieldAttribute('femaleyld', 'class', $class.' disabled no-click');
 			if (!$form->getValue('femaleyld'))
 			{
-				// [9826] Disable fields while saving.
+				// [9993] Disable fields while saving.
 				$form->setFieldAttribute('femaleyld', 'filter', 'unset');
-				// [9828] Disable fields while saving.
+				// [9995] Disable fields while saving.
 				$form->setFieldAttribute('femaleyld', 'required', 'false');
 			}
 		}
@@ -320,7 +320,7 @@ class CostbenefitprojectionModelHealth_data extends JModelAdmin
 			}
 
 			$user = JFactory::getUser();
-			// [9952] The record has been set. Check the record permissions.
+			// [10119] 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)
 		{
-			// [10039] The record has been set. Check the record permissions.
+			// [10206] 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;
 			}
 		}
-		// [10056] In the absense of better information, revert to the component permissions.
+		// [10223] 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')
 	{
-		// [9864] Check specific edit permission then general edit permission.
+		// [10031] 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'))
@@ -601,7 +601,7 @@ class CostbenefitprojectionModelHealth_data extends JModelAdmin
 	{
 		if (empty($this->batchSet))
 		{
-			// [5015] Set some needed variables.
+			// [5179] Set some needed variables.
 			$this->user 		= JFactory::getUser();
 			$this->table 		= $this->getTable();
 			$this->tableClassName	= get_class($this->table);
@@ -646,12 +646,12 @@ class CostbenefitprojectionModelHealth_data extends JModelAdmin
 			}
 		}
 
-		// [5035] get list of uniqe fields
+		// [5199] get list of uniqe fields
 		$uniqeFields = $this->getUniqeFields();
-		// [5037] remove move_copy from array
+		// [5201] remove move_copy from array
 		unset($values['move_copy']);
 
-		// [5040] make sure published is set
+		// [5204] make sure published is set
 		if (!isset($values['published']))
 		{
 			$values['published'] = 0;
@@ -663,21 +663,21 @@ class CostbenefitprojectionModelHealth_data extends JModelAdmin
 
 		$newIds = array();
 
-		// [5077] Parent exists so let's proceed
+		// [5241] Parent exists so let's proceed
 		while (!empty($pks))
 		{
-			// [5080] Pop the first ID off the stack
+			// [5244] Pop the first ID off the stack
 			$pk = array_shift($pks);
 
 			$this->table->reset();
 
-			// [5085] only allow copy if user may edit this item.
+			// [5249] only allow copy if user may edit this item.
 
 			if (!$this->user->authorise('health_data.edit', $contexts[$pk]))
 
 			{
 
-				// [5095] Not fatal error
+				// [5259] Not fatal error
 
 				$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 
@@ -685,19 +685,19 @@ class CostbenefitprojectionModelHealth_data extends JModelAdmin
 
 			}
 
-			// [5100] Check that the row actually exists
+			// [5264] Check that the row actually exists
 			if (!$this->table->load($pk))
 			{
 				if ($error = $this->table->getError())
 				{
-					// [5105] Fatal error
+					// [5269] Fatal error
 					$this->setError($error);
 
 					return false;
 				}
 				else
 				{
-					// [5112] Not fatal error
+					// [5276] Not fatal error
 					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 					continue;
 				}
@@ -705,7 +705,7 @@ class CostbenefitprojectionModelHealth_data extends JModelAdmin
 
 			$this->table->causerisk = $this->generateUniqe('causerisk',$this->table->causerisk);
 
-			// [5148] insert all set values
+			// [5312] insert all set values
 			if (CostbenefitprojectionHelper::checkArray($values))
 			{
 				foreach ($values as $key => $value)
@@ -717,7 +717,7 @@ class CostbenefitprojectionModelHealth_data extends JModelAdmin
 				}
 			}
 
-			// [5160] update all uniqe fields
+			// [5324] update all uniqe fields
 			if (CostbenefitprojectionHelper::checkArray($uniqeFields))
 			{
 				foreach ($uniqeFields as $uniqeField)
@@ -726,13 +726,13 @@ class CostbenefitprojectionModelHealth_data extends JModelAdmin
 				}
 			}
 
-			// [5169] Reset the ID because we are making a copy
+			// [5333] Reset the ID because we are making a copy
 			$this->table->id = 0;
 
-			// [5172] TODO: Deal with ordering?
-			// [5173] $this->table->ordering	= 1;
+			// [5336] TODO: Deal with ordering?
+			// [5337] $this->table->ordering	= 1;
 
-			// [5175] Check the row.
+			// [5339] Check the row.
 			if (!$this->table->check())
 			{
 				$this->setError($this->table->getError());
@@ -745,7 +745,7 @@ class CostbenefitprojectionModelHealth_data extends JModelAdmin
 				$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
 			}
 
-			// [5188] Store the row.
+			// [5352] Store the row.
 			if (!$this->table->store())
 			{
 				$this->setError($this->table->getError());
@@ -753,14 +753,14 @@ class CostbenefitprojectionModelHealth_data extends JModelAdmin
 				return false;
 			}
 
-			// [5196] Get the new item ID
+			// [5360] Get the new item ID
 			$newId = $this->table->get('id');
 
-			// [5199] Add the new ID to the array
+			// [5363] Add the new ID to the array
 			$newIds[$pk] = $newId;
 		}
 
-		// [5203] Clean the cache
+		// [5367] Clean the cache
 		$this->cleanCache();
 
 		return $newIds;
@@ -781,7 +781,7 @@ class CostbenefitprojectionModelHealth_data extends JModelAdmin
 	{
 		if (empty($this->batchSet))
 		{
-			// [4817] Set some needed variables.
+			// [4981] Set some needed variables.
 			$this->user		= JFactory::getUser();
 			$this->table		= $this->getTable();
 			$this->tableClassName	= get_class($this->table);
@@ -827,15 +827,15 @@ class CostbenefitprojectionModelHealth_data extends JModelAdmin
 			}
 		}
 
-		// [4839] make sure published only updates if user has the permission.
+		// [5003] make sure published only updates if user has the permission.
 		if (isset($values['published']) && !$this->canDo->get('health_data.edit.state'))
 		{
 			unset($values['published']);
 		}
-		// [4852] remove move_copy from array
+		// [5016] remove move_copy from array
 		unset($values['move_copy']);
 
-		// [4873] Parent exists so we proceed
+		// [5037] Parent exists so we proceed
 		foreach ($pks as $pk)
 		{
 			if (!$this->user->authorise('health_data.edit', $contexts[$pk]))
@@ -845,30 +845,30 @@ class CostbenefitprojectionModelHealth_data extends JModelAdmin
 				return false;
 			}
 
-			// [4890] Check that the row actually exists
+			// [5054] Check that the row actually exists
 			if (!$this->table->load($pk))
 			{
 				if ($error = $this->table->getError())
 				{
-					// [4895] Fatal error
+					// [5059] Fatal error
 					$this->setError($error);
 
 					return false;
 				}
 				else
 				{
-					// [4902] Not fatal error
+					// [5066] Not fatal error
 					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 					continue;
 				}
 			}
 
-			// [4908] insert all set values.
+			// [5072] insert all set values.
 			if (CostbenefitprojectionHelper::checkArray($values))
 			{
 				foreach ($values as $key => $value)
 				{
-					// [4913] Do special action for access.
+					// [5077] Do special action for access.
 					if ('access' == $key && strlen($value) > 0)
 					{
 						$this->table->$key = $value;
@@ -881,7 +881,7 @@ class CostbenefitprojectionModelHealth_data extends JModelAdmin
 			}
 
 
-			// [4925] Check the row.
+			// [5089] Check the row.
 			if (!$this->table->check())
 			{
 				$this->setError($this->table->getError());
@@ -894,7 +894,7 @@ class CostbenefitprojectionModelHealth_data extends JModelAdmin
 				$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
 			}
 
-			// [4938] Store the row.
+			// [5102] Store the row.
 			if (!$this->table->store())
 			{
 				$this->setError($this->table->getError());
@@ -903,7 +903,7 @@ class CostbenefitprojectionModelHealth_data extends JModelAdmin
 			}
 		}
 
-		// [4947] Clean the cache
+		// [5111] Clean the cache
 		$this->cleanCache();
 
 		return true;
@@ -941,10 +941,10 @@ class CostbenefitprojectionModelHealth_data extends JModelAdmin
 			$data['params'] = (string) $params;
 		}
 
-		// [5295] Alter the uniqe field for save as copy
+		// [5459] Alter the uniqe field for save as copy
 		if ($input->get('task') == 'save2copy')
 		{
-			// [5298] Automatic handling of other uniqe fields
+			// [5462] Automatic handling of other uniqe fields
 			$uniqeFields = $this->getUniqeFields();
 			if (CostbenefitprojectionHelper::checkArray($uniqeFields))
 			{
@@ -997,7 +997,7 @@ class CostbenefitprojectionModelHealth_data extends JModelAdmin
 	protected function _generateNewTitle($title)
 	{
 
-		// [5353] Alter the title
+		// [5517] 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 701c3137..19c42aa8 100644
--- a/admin/models/health_data_sets.php
+++ b/admin/models/health_data_sets.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		health_data_sets.php
@@ -99,16 +99,16 @@ class CostbenefitprojectionModelHealth_data_sets extends JModelList
 	 */
 	public function getItems()
 	{ 
-		// [10621] check in items
+		// [10792] check in items
 		$this->checkInNow();
 
 		// load parent items
 		$items = parent::getItems();
 
-		// [10696] set values to display correctly.
+		// [10867] set values to display correctly.
 		if (CostbenefitprojectionHelper::checkArray($items))
 		{
-			// [10699] get user object.
+			// [10870] get user object.
 			$user = JFactory::getUser();
 			foreach ($items as $nr => &$item)
 			{
@@ -122,12 +122,12 @@ class CostbenefitprojectionModelHealth_data_sets extends JModelList
 			}
 		} 
 
-		// [10962] set selection value to a translatable value
+		// [11133] set selection value to a translatable value
 		if (CostbenefitprojectionHelper::checkArray($items))
 		{
 			foreach ($items as $nr => &$item)
 			{
-				// [10969] convert year
+				// [11140] convert year
 				$item->year = $this->selectionTranslation($item->year, 'year');
 			}
 		}
@@ -144,7 +144,7 @@ class CostbenefitprojectionModelHealth_data_sets extends JModelList
 	*/
 	public function selectionTranslation($value,$name)
 	{
-		// [10995] Array of year language strings
+		// [11166] 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'
 			);
-			// [11026] Now check if value is found in this array
+			// [11197] 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()
 	{
-		// [7482] Get the user object.
+		// [7649] Get the user object.
 		$user = JFactory::getUser();
-		// [7484] Create a new query object.
+		// [7651] Create a new query object.
 		$db = JFactory::getDBO();
 		$query = $db->getQuery(true);
 
-		// [7487] Select some fields
+		// [7654] Select some fields
 		$query->select('a.*');
 
-		// [7494] From the costbenefitprojection_item table
+		// [7661] 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
 			}
 		}
 
-		// [7635] From the costbenefitprojection_causerisk table.
+		// [7802] 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') . ')');
 
-		// [7635] From the costbenefitprojection_country table.
+		// [7802] 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') . ')');
 
-		// [7508] Filter by published state
+		// [7675] 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)');
 		}
 
-		// [7520] Join over the asset groups.
+		// [7687] Join over the asset groups.
 		$query->select('ag.title AS access_level');
 		$query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
-		// [7523] Filter by access level.
+		// [7690] Filter by access level.
 		if ($access = $this->getState('filter.access'))
 		{
 			$query->where('a.access = ' . (int) $access);
 		}
-		// [7528] Implement View Level Access
+		// [7695] Implement View Level Access
 		if (!$user->authorise('core.options', 'com_costbenefitprojection'))
 		{
 			$groups = implode(',', $user->getAuthorisedViewLevels());
 			$query->where('a.access IN (' . $groups . ')');
 		}
-		// [7605] Filter by search.
+		// [7772] Filter by search.
 		$search = $this->getState('filter.search');
 		if (!empty($search))
 		{
@@ -259,23 +259,23 @@ class CostbenefitprojectionModelHealth_data_sets extends JModelList
 			}
 		}
 
-		// [7839] Filter by causerisk.
+		// [8006] Filter by causerisk.
 		if ($causerisk = $this->getState('filter.causerisk'))
 		{
 			$query->where('a.causerisk = ' . $db->quote($db->escape($causerisk, true)));
 		}
-		// [7848] Filter by Year.
+		// [8015] Filter by Year.
 		if ($year = $this->getState('filter.year'))
 		{
 			$query->where('a.year = ' . $db->quote($db->escape($year, true)));
 		}
-		// [7839] Filter by country.
+		// [8006] Filter by country.
 		if ($country = $this->getState('filter.country'))
 		{
 			$query->where('a.country = ' . $db->quote($db->escape($country, true)));
 		}
 
-		// [7564] Add the list ordering clause.
+		// [7731] 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)
 	{
-		// [7272] setup the query
+		// [7439] setup the query
 		if (CostbenefitprojectionHelper::checkArray($pks))
 		{
-			// [7275] Get the user object.
+			// [7442] Get the user object.
 			$user = JFactory::getUser();
-			// [7277] Create a new query object.
+			// [7444] Create a new query object.
 			$db = JFactory::getDBO();
 			$query = $db->getQuery(true);
 
-			// [7280] Select some fields
+			// [7447] Select some fields
 			$query->select('a.*');
 
-			// [7282] From the costbenefitprojection_health_data table
+			// [7449] 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');
 			}
 		}
-			// [7292] Implement View Level Access
+			// [7459] Implement View Level Access
 			if (!$user->authorise('core.options', 'com_costbenefitprojection'))
 			{
 				$groups = implode(',', $user->getAuthorisedViewLevels());
 				$query->where('a.access IN (' . $groups . ')');
 			}
 
-			// [7299] Order the results by ordering
+			// [7466] Order the results by ordering
 			$query->order('a.ordering  ASC');
 
-			// [7301] Load the items
+			// [7468] Load the items
 			$db->setQuery($query);
 			$db->execute();
 			if ($db->getNumRows())
 			{
 				$items = $db->loadObjectList();
 
-				// [10696] set values to display correctly.
+				// [10867] set values to display correctly.
 				if (CostbenefitprojectionHelper::checkArray($items))
 				{
-					// [10699] get user object.
+					// [10870] get user object.
 					$user = JFactory::getUser();
 					foreach ($items as $nr => &$item)
 					{
@@ -357,13 +357,13 @@ class CostbenefitprojectionModelHealth_data_sets extends JModelList
 							continue;
 						}
 
-						// [10909] unset the values we don't want exported.
+						// [11080] unset the values we don't want exported.
 						unset($item->asset_id);
 						unset($item->checked_out);
 						unset($item->checked_out_time);
 					}
 				}
-				// [10918] Add headers to items array.
+				// [11089] 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()
 	{
-		// [7321] Get a db connection.
+		// [7488] Get a db connection.
 		$db = JFactory::getDbo();
-		// [7323] get the columns
+		// [7490] get the columns
 		$columns = $db->getTableColumns("#__costbenefitprojection_health_data");
 		if (CostbenefitprojectionHelper::checkArray($columns))
 		{
-			// [7327] remove the headers you don't import/export.
+			// [7494] 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 = '')
 	{
-		// [10244] Compile the store id.
+		// [10415] 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()
 	{
-		// [10637] Get set check in time
+		// [10808] Get set check in time
 		$time = JComponentHelper::getParams('com_costbenefitprojection')->get('check_in');
 		
 		if ($time)
 		{
 
-			// [10642] Get a db connection.
+			// [10813] Get a db connection.
 			$db = JFactory::getDbo();
-			// [10644] reset query
+			// [10815] 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())
 			{
-				// [10652] Get Yesterdays date
+				// [10823] Get Yesterdays date
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// [10654] reset query
+				// [10825] reset query
 				$query = $db->getQuery(true);
 
-				// [10656] Fields to update.
+				// [10827] Fields to update.
 				$fields = array(
 					$db->quoteName('checked_out_time') . '=\'0000-00-00 00:00:00\'',
 					$db->quoteName('checked_out') . '=0'
 				);
 
-				// [10661] Conditions for which records should be updated.
+				// [10832] Conditions for which records should be updated.
 				$conditions = array(
 					$db->quoteName('checked_out') . '!=0', 
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);
 
-				// [10666] Check table
+				// [10837] 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 644cbc7b..3607bfd7 100644
--- a/admin/models/help_document.php
+++ b/admin/models/help_document.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		help_document.php
@@ -91,7 +91,7 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
 
 			if (!empty($item->groups))
 			{
-				// [4059] JSON Decode groups.
+				// [4223] 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)
-	{		// [9651] Get the form.
+	{		// [9818] 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;
 
-		// [9736] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first.
+		// [9903] 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');
 		}
-		// [9741] The back end uses id so we use that the rest of the time and set it to 0 by default.
+		// [9908] 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();
 
-		// [9747] Check for existing item.
-		// [9748] Modify the form based on Edit State access controls.
+		// [9914] Check for existing item.
+		// [9915] 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')))
 		{
-			// [9761] Disable fields for display.
+			// [9928] Disable fields for display.
 			$form->setFieldAttribute('ordering', 'disabled', 'true');
 			$form->setFieldAttribute('published', 'disabled', 'true');
-			// [9764] Disable fields while saving.
+			// [9931] Disable fields while saving.
 			$form->setFieldAttribute('ordering', 'filter', 'unset');
 			$form->setFieldAttribute('published', 'filter', 'unset');
 		}
-		// [9769] Modify the form based on Edit Creaded By access controls.
+		// [9936] Modify the form based on Edit Creaded By access controls.
 		if (!$user->authorise('core.edit.created_by', 'com_costbenefitprojection'))
 		{
-			// [9781] Disable fields for display.
+			// [9948] Disable fields for display.
 			$form->setFieldAttribute('created_by', 'disabled', 'true');
-			// [9783] Disable fields for display.
+			// [9950] Disable fields for display.
 			$form->setFieldAttribute('created_by', 'readonly', 'true');
-			// [9785] Disable fields while saving.
+			// [9952] Disable fields while saving.
 			$form->setFieldAttribute('created_by', 'filter', 'unset');
 		}
-		// [9788] Modify the form based on Edit Creaded Date access controls.
+		// [9955] Modify the form based on Edit Creaded Date access controls.
 		if (!$user->authorise('core.edit.created', 'com_costbenefitprojection'))
 		{
-			// [9800] Disable fields for display.
+			// [9967] Disable fields for display.
 			$form->setFieldAttribute('created', 'disabled', 'true');
-			// [9802] Disable fields while saving.
+			// [9969] Disable fields while saving.
 			$form->setFieldAttribute('created', 'filter', 'unset');
 		}
 
@@ -202,7 +202,7 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
 			}
 
 			$user = JFactory::getUser();
-			// [9952] The record has been set. Check the record permissions.
+			// [10119] 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)
 		{
-			// [10039] The record has been set. Check the record permissions.
+			// [10206] 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;
 			}
 		}
-		// [10056] In the absense of better information, revert to the component permissions.
+		// [10223] 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')
 	{
-		// [9864] Check specific edit permission then general edit permission.
+		// [10031] 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)
 	{
-		// [8855] check if the not_required field is set
+		// [9022] 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);
-			// [8860] now change the required field attributes value
+			// [9027] now change the required field attributes value
 			foreach ($requiredFields as $requiredField)
 			{
-				// [8863] make sure there is a string value
+				// [9030] make sure there is a string value
 				if (CostbenefitprojectionHelper::checkString($requiredField))
 				{
-					// [8866] change to false
+					// [9033] change to false
 					$form->setFieldAttribute($requiredField, 'required', 'false');
-					// [8868] also clear the data set
+					// [9035] also clear the data set
 					$data[$requiredField] = '';
 				}
 			}
@@ -508,7 +508,7 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
 	{
 		if (empty($this->batchSet))
 		{
-			// [5015] Set some needed variables.
+			// [5179] Set some needed variables.
 			$this->user 		= JFactory::getUser();
 			$this->table 		= $this->getTable();
 			$this->tableClassName	= get_class($this->table);
@@ -522,12 +522,12 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
 			return false;
 		}
 
-		// [5035] get list of uniqe fields
+		// [5199] get list of uniqe fields
 		$uniqeFields = $this->getUniqeFields();
-		// [5037] remove move_copy from array
+		// [5201] remove move_copy from array
 		unset($values['move_copy']);
 
-		// [5040] make sure published is set
+		// [5204] make sure published is set
 		if (!isset($values['published']))
 		{
 			$values['published'] = 0;
@@ -539,21 +539,21 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
 
 		$newIds = array();
 
-		// [5077] Parent exists so let's proceed
+		// [5241] Parent exists so let's proceed
 		while (!empty($pks))
 		{
-			// [5080] Pop the first ID off the stack
+			// [5244] Pop the first ID off the stack
 			$pk = array_shift($pks);
 
 			$this->table->reset();
 
-			// [5085] only allow copy if user may edit this item.
+			// [5249] only allow copy if user may edit this item.
 
 			if (!$this->user->authorise('help_document.edit', $contexts[$pk]))
 
 			{
 
-				// [5095] Not fatal error
+				// [5259] Not fatal error
 
 				$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 
@@ -561,19 +561,19 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
 
 			}
 
-			// [5100] Check that the row actually exists
+			// [5264] Check that the row actually exists
 			if (!$this->table->load($pk))
 			{
 				if ($error = $this->table->getError())
 				{
-					// [5105] Fatal error
+					// [5269] Fatal error
 					$this->setError($error);
 
 					return false;
 				}
 				else
 				{
-					// [5112] Not fatal error
+					// [5276] Not fatal error
 					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 					continue;
 				}
@@ -581,7 +581,7 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
 
 			list($this->table->title, $this->table->alias) = $this->_generateNewTitle($this->table->alias, $this->table->title);
 
-			// [5148] insert all set values
+			// [5312] insert all set values
 			if (CostbenefitprojectionHelper::checkArray($values))
 			{
 				foreach ($values as $key => $value)
@@ -593,7 +593,7 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
 				}
 			}
 
-			// [5160] update all uniqe fields
+			// [5324] update all uniqe fields
 			if (CostbenefitprojectionHelper::checkArray($uniqeFields))
 			{
 				foreach ($uniqeFields as $uniqeField)
@@ -602,13 +602,13 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
 				}
 			}
 
-			// [5169] Reset the ID because we are making a copy
+			// [5333] Reset the ID because we are making a copy
 			$this->table->id = 0;
 
-			// [5172] TODO: Deal with ordering?
-			// [5173] $this->table->ordering	= 1;
+			// [5336] TODO: Deal with ordering?
+			// [5337] $this->table->ordering	= 1;
 
-			// [5175] Check the row.
+			// [5339] Check the row.
 			if (!$this->table->check())
 			{
 				$this->setError($this->table->getError());
@@ -621,7 +621,7 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
 				$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
 			}
 
-			// [5188] Store the row.
+			// [5352] Store the row.
 			if (!$this->table->store())
 			{
 				$this->setError($this->table->getError());
@@ -629,14 +629,14 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
 				return false;
 			}
 
-			// [5196] Get the new item ID
+			// [5360] Get the new item ID
 			$newId = $this->table->get('id');
 
-			// [5199] Add the new ID to the array
+			// [5363] Add the new ID to the array
 			$newIds[$pk] = $newId;
 		}
 
-		// [5203] Clean the cache
+		// [5367] Clean the cache
 		$this->cleanCache();
 
 		return $newIds;
@@ -657,7 +657,7 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
 	{
 		if (empty($this->batchSet))
 		{
-			// [4817] Set some needed variables.
+			// [4981] Set some needed variables.
 			$this->user		= JFactory::getUser();
 			$this->table		= $this->getTable();
 			$this->tableClassName	= get_class($this->table);
@@ -672,15 +672,15 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
 			return false;
 		}
 
-		// [4839] make sure published only updates if user has the permission.
+		// [5003] make sure published only updates if user has the permission.
 		if (isset($values['published']) && !$this->canDo->get('help_document.edit.state'))
 		{
 			unset($values['published']);
 		}
-		// [4852] remove move_copy from array
+		// [5016] remove move_copy from array
 		unset($values['move_copy']);
 
-		// [4873] Parent exists so we proceed
+		// [5037] Parent exists so we proceed
 		foreach ($pks as $pk)
 		{
 			if (!$this->user->authorise('help_document.edit', $contexts[$pk]))
@@ -690,30 +690,30 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
 				return false;
 			}
 
-			// [4890] Check that the row actually exists
+			// [5054] Check that the row actually exists
 			if (!$this->table->load($pk))
 			{
 				if ($error = $this->table->getError())
 				{
-					// [4895] Fatal error
+					// [5059] Fatal error
 					$this->setError($error);
 
 					return false;
 				}
 				else
 				{
-					// [4902] Not fatal error
+					// [5066] Not fatal error
 					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 					continue;
 				}
 			}
 
-			// [4908] insert all set values.
+			// [5072] insert all set values.
 			if (CostbenefitprojectionHelper::checkArray($values))
 			{
 				foreach ($values as $key => $value)
 				{
-					// [4913] Do special action for access.
+					// [5077] Do special action for access.
 					if ('access' == $key && strlen($value) > 0)
 					{
 						$this->table->$key = $value;
@@ -726,7 +726,7 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
 			}
 
 
-			// [4925] Check the row.
+			// [5089] Check the row.
 			if (!$this->table->check())
 			{
 				$this->setError($this->table->getError());
@@ -739,7 +739,7 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
 				$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
 			}
 
-			// [4938] Store the row.
+			// [5102] Store the row.
 			if (!$this->table->store())
 			{
 				$this->setError($this->table->getError());
@@ -748,7 +748,7 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
 			}
 		}
 
-		// [4947] Clean the cache
+		// [5111] Clean the cache
 		$this->cleanCache();
 
 		return true;
@@ -778,7 +778,7 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
 			$data['metadata'] = (string) $metadata;
 		} 
 
-		// [4169] Set the groups string to JSON string.
+		// [4333] Set the groups string to JSON string.
 		if (isset($data['groups']))
 		{
 			$data['groups'] = (string) json_encode($data['groups']);
@@ -792,7 +792,7 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
 			$data['params'] = (string) $params;
 		}
 
-		// [5229] Alter the title for save as copy
+		// [5393] Alter the title for save as copy
 		if ($input->get('task') == 'save2copy')
 		{
 			$origTable = clone $this->getTable();
@@ -815,7 +815,7 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
 			$data['published'] = 0;
 		}
 
-		// [5256] Automatic handling of alias for empty fields
+		// [5420] 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)
@@ -846,10 +846,10 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
 			}
 		}
 
-		// [5295] Alter the uniqe field for save as copy
+		// [5459] Alter the uniqe field for save as copy
 		if ($input->get('task') == 'save2copy')
 		{
-			// [5298] Automatic handling of other uniqe fields
+			// [5462] Automatic handling of other uniqe fields
 			$uniqeFields = $this->getUniqeFields();
 			if (CostbenefitprojectionHelper::checkArray($uniqeFields))
 			{
@@ -903,7 +903,7 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
 	protected function _generateNewTitle($alias, $title)
 	{
 
-		// [5329] Alter the title & alias
+		// [5493] 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 efd75f37..adb93e6e 100644
--- a/admin/models/help_documents.php
+++ b/admin/models/help_documents.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		help_documents.php
@@ -107,16 +107,16 @@ class CostbenefitprojectionModelHelp_documents extends JModelList
 	 */
 	public function getItems()
 	{ 
-		// [10621] check in items
+		// [10792] check in items
 		$this->checkInNow();
 
 		// load parent items
 		$items = parent::getItems();
 
-		// [10696] set values to display correctly.
+		// [10867] set values to display correctly.
 		if (CostbenefitprojectionHelper::checkArray($items))
 		{
-			// [10699] get user object.
+			// [10870] get user object.
 			$user = JFactory::getUser();
 			foreach ($items as $nr => &$item)
 			{
@@ -127,7 +127,7 @@ class CostbenefitprojectionModelHelp_documents extends JModelList
 					continue;
 				}
 
-				// [10767] decode groups
+				// [10938] decode groups
 				$groupsArray = json_decode($item->groups, true);
 				if (CostbenefitprojectionHelper::checkArray($groupsArray))
 				{
@@ -150,14 +150,14 @@ class CostbenefitprojectionModelHelp_documents extends JModelList
 			}
 		} 
 
-		// [10962] set selection value to a translatable value
+		// [11133] set selection value to a translatable value
 		if (CostbenefitprojectionHelper::checkArray($items))
 		{
 			foreach ($items as $nr => &$item)
 			{
-				// [10969] convert type
+				// [11140] convert type
 				$item->type = $this->selectionTranslation($item->type, 'type');
-				// [10969] convert location
+				// [11140] convert location
 				$item->location = $this->selectionTranslation($item->location, 'location');
 			}
 		}
@@ -174,7 +174,7 @@ class CostbenefitprojectionModelHelp_documents extends JModelList
 	*/
 	public function selectionTranslation($value,$name)
 	{
-		// [10995] Array of type language strings
+		// [11166] 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'
 			);
-			// [11026] Now check if value is found in this array
+			// [11197] Now check if value is found in this array
 			if (isset($typeArray[$value]) && CostbenefitprojectionHelper::checkString($typeArray[$value]))
 			{
 				return $typeArray[$value];
 			}
 		}
-		// [10995] Array of location language strings
+		// [11166] Array of location language strings
 		if ($name == 'location')
 		{
 			$locationArray = array(
 				1 => 'COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_ADMIN',
 				2 => 'COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_SITE'
 			);
-			// [11026] Now check if value is found in this array
+			// [11197] 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()
 	{
-		// [7482] Get the user object.
+		// [7649] Get the user object.
 		$user = JFactory::getUser();
-		// [7484] Create a new query object.
+		// [7651] Create a new query object.
 		$db = JFactory::getDBO();
 		$query = $db->getQuery(true);
 
-		// [7487] Select some fields
+		// [7654] Select some fields
 		$query->select('a.*');
 
-		// [7494] From the costbenefitprojection_item table
+		// [7661] From the costbenefitprojection_item table
 		$query->from($db->quoteName('#__costbenefitprojection_help_document', 'a'));
 
-		// [7508] Filter by published state
+		// [7675] 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)');
 		}
-		// [7605] Filter by search.
+		// [7772] Filter by search.
 		$search = $this->getState('filter.search');
 		if (!empty($search))
 		{
@@ -249,28 +249,28 @@ class CostbenefitprojectionModelHelp_documents extends JModelList
 			}
 		}
 
-		// [7848] Filter by Type.
+		// [8015] Filter by Type.
 		if ($type = $this->getState('filter.type'))
 		{
 			$query->where('a.type = ' . $db->quote($db->escape($type, true)));
 		}
-		// [7848] Filter by Location.
+		// [8015] Filter by Location.
 		if ($location = $this->getState('filter.location'))
 		{
 			$query->where('a.location = ' . $db->quote($db->escape($location, true)));
 		}
-		// [7848] Filter by Admin_view.
+		// [8015] Filter by Admin_view.
 		if ($admin_view = $this->getState('filter.admin_view'))
 		{
 			$query->where('a.admin_view = ' . $db->quote($db->escape($admin_view, true)));
 		}
-		// [7848] Filter by Site_view.
+		// [8015] Filter by Site_view.
 		if ($site_view = $this->getState('filter.site_view'))
 		{
 			$query->where('a.site_view = ' . $db->quote($db->escape($site_view, true)));
 		}
 
-		// [7564] Add the list ordering clause.
+		// [7731] 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)
 	{
-		// [7272] setup the query
+		// [7439] setup the query
 		if (CostbenefitprojectionHelper::checkArray($pks))
 		{
-			// [7275] Get the user object.
+			// [7442] Get the user object.
 			$user = JFactory::getUser();
-			// [7277] Create a new query object.
+			// [7444] Create a new query object.
 			$db = JFactory::getDBO();
 			$query = $db->getQuery(true);
 
-			// [7280] Select some fields
+			// [7447] Select some fields
 			$query->select('a.*');
 
-			// [7282] From the costbenefitprojection_help_document table
+			// [7449] From the costbenefitprojection_help_document table
 			$query->from($db->quoteName('#__costbenefitprojection_help_document', 'a'));
 			$query->where('a.id IN (' . implode(',',$pks) . ')');
 
-			// [7299] Order the results by ordering
+			// [7466] Order the results by ordering
 			$query->order('a.ordering  ASC');
 
-			// [7301] Load the items
+			// [7468] Load the items
 			$db->setQuery($query);
 			$db->execute();
 			if ($db->getNumRows())
 			{
 				$items = $db->loadObjectList();
 
-				// [10696] set values to display correctly.
+				// [10867] set values to display correctly.
 				if (CostbenefitprojectionHelper::checkArray($items))
 				{
-					// [10699] get user object.
+					// [10870] get user object.
 					$user = JFactory::getUser();
 					foreach ($items as $nr => &$item)
 					{
@@ -328,13 +328,13 @@ class CostbenefitprojectionModelHelp_documents extends JModelList
 							continue;
 						}
 
-						// [10909] unset the values we don't want exported.
+						// [11080] unset the values we don't want exported.
 						unset($item->asset_id);
 						unset($item->checked_out);
 						unset($item->checked_out_time);
 					}
 				}
-				// [10918] Add headers to items array.
+				// [11089] Add headers to items array.
 				$headers = $this->getExImPortHeaders();
 				if (CostbenefitprojectionHelper::checkObject($headers))
 				{
@@ -353,13 +353,13 @@ class CostbenefitprojectionModelHelp_documents extends JModelList
 	*/
 	public function getExImPortHeaders()
 	{
-		// [7321] Get a db connection.
+		// [7488] Get a db connection.
 		$db = JFactory::getDbo();
-		// [7323] get the columns
+		// [7490] get the columns
 		$columns = $db->getTableColumns("#__costbenefitprojection_help_document");
 		if (CostbenefitprojectionHelper::checkArray($columns))
 		{
-			// [7327] remove the headers you don't import/export.
+			// [7494] 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 = '')
 	{
-		// [10244] Compile the store id.
+		// [10415] 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()
 	{
-		// [10637] Get set check in time
+		// [10808] Get set check in time
 		$time = JComponentHelper::getParams('com_costbenefitprojection')->get('check_in');
 		
 		if ($time)
 		{
 
-			// [10642] Get a db connection.
+			// [10813] Get a db connection.
 			$db = JFactory::getDbo();
-			// [10644] reset query
+			// [10815] 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())
 			{
-				// [10652] Get Yesterdays date
+				// [10823] Get Yesterdays date
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// [10654] reset query
+				// [10825] reset query
 				$query = $db->getQuery(true);
 
-				// [10656] Fields to update.
+				// [10827] Fields to update.
 				$fields = array(
 					$db->quoteName('checked_out_time') . '=\'0000-00-00 00:00:00\'',
 					$db->quoteName('checked_out') . '=0'
 				);
 
-				// [10661] Conditions for which records should be updated.
+				// [10832] Conditions for which records should be updated.
 				$conditions = array(
 					$db->quoteName('checked_out') . '!=0', 
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);
 
-				// [10666] Check table
+				// [10837] 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 5b136bab..f1fc93bd 100644
--- a/admin/models/import.php
+++ b/admin/models/import.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		import.php
diff --git a/admin/models/intervention.php b/admin/models/intervention.php
index d6b6dfb5..2f353bd2 100644
--- a/admin/models/intervention.php
+++ b/admin/models/intervention.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		intervention.php
@@ -91,7 +91,7 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 
 			if (!empty($item->interventions))
 			{
-				// [4059] JSON Decode interventions.
+				// [4223] 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)
-	{		// [9651] Get the form.
+	{		// [9818] 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;
 
-		// [9736] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first.
+		// [9903] 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');
 		}
-		// [9741] The back end uses id so we use that the rest of the time and set it to 0 by default.
+		// [9908] 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();
 
-		// [9747] Check for existing item.
-		// [9748] Modify the form based on Edit State access controls.
+		// [9914] Check for existing item.
+		// [9915] 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')))
 		{
-			// [9761] Disable fields for display.
+			// [9928] Disable fields for display.
 			$form->setFieldAttribute('ordering', 'disabled', 'true');
 			$form->setFieldAttribute('published', 'disabled', 'true');
-			// [9764] Disable fields while saving.
+			// [9931] Disable fields while saving.
 			$form->setFieldAttribute('ordering', 'filter', 'unset');
 			$form->setFieldAttribute('published', 'filter', 'unset');
 		}
-		// [9769] Modify the form based on Edit Creaded By access controls.
+		// [9936] Modify the form based on Edit Creaded By access controls.
 		if (!$user->authorise('core.edit.created_by', 'com_costbenefitprojection'))
 		{
-			// [9781] Disable fields for display.
+			// [9948] Disable fields for display.
 			$form->setFieldAttribute('created_by', 'disabled', 'true');
-			// [9783] Disable fields for display.
+			// [9950] Disable fields for display.
 			$form->setFieldAttribute('created_by', 'readonly', 'true');
-			// [9785] Disable fields while saving.
+			// [9952] Disable fields while saving.
 			$form->setFieldAttribute('created_by', 'filter', 'unset');
 		}
-		// [9788] Modify the form based on Edit Creaded Date access controls.
+		// [9955] Modify the form based on Edit Creaded Date access controls.
 		if (!$user->authorise('core.edit.created', 'com_costbenefitprojection'))
 		{
-			// [9800] Disable fields for display.
+			// [9967] Disable fields for display.
 			$form->setFieldAttribute('created', 'disabled', 'true');
-			// [9802] Disable fields while saving.
+			// [9969] Disable fields while saving.
 			$form->setFieldAttribute('created', 'filter', 'unset');
 		}
 
@@ -202,7 +202,7 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 			}
 
 			$user = JFactory::getUser();
-			// [9952] The record has been set. Check the record permissions.
+			// [10119] 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)
 		{
-			// [10039] The record has been set. Check the record permissions.
+			// [10206] 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;
 			}
 		}
-		// [10056] In the absense of better information, revert to the component permissions.
+		// [10223] 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')
 	{
-		// [9864] Check specific edit permission then general edit permission.
+		// [10031] 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)
 	{
-		// [8855] check if the not_required field is set
+		// [9022] 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);
-			// [8860] now change the required field attributes value
+			// [9027] now change the required field attributes value
 			foreach ($requiredFields as $requiredField)
 			{
-				// [8863] make sure there is a string value
+				// [9030] make sure there is a string value
 				if (CostbenefitprojectionHelper::checkString($requiredField))
 				{
-					// [8866] change to false
+					// [9033] change to false
 					$form->setFieldAttribute($requiredField, 'required', 'false');
-					// [8868] also clear the data set
+					// [9035] also clear the data set
 					$data[$requiredField] = '';
 				}
 			}
@@ -524,7 +524,7 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 	{
 		if (empty($this->batchSet))
 		{
-			// [5015] Set some needed variables.
+			// [5179] Set some needed variables.
 			$this->user 		= JFactory::getUser();
 			$this->table 		= $this->getTable();
 			$this->tableClassName	= get_class($this->table);
@@ -582,12 +582,12 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 			}
 		}
 
-		// [5035] get list of uniqe fields
+		// [5199] get list of uniqe fields
 		$uniqeFields = $this->getUniqeFields();
-		// [5037] remove move_copy from array
+		// [5201] remove move_copy from array
 		unset($values['move_copy']);
 
-		// [5040] make sure published is set
+		// [5204] make sure published is set
 		if (!isset($values['published']))
 		{
 			$values['published'] = 0;
@@ -599,21 +599,21 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 
 		$newIds = array();
 
-		// [5077] Parent exists so let's proceed
+		// [5241] Parent exists so let's proceed
 		while (!empty($pks))
 		{
-			// [5080] Pop the first ID off the stack
+			// [5244] Pop the first ID off the stack
 			$pk = array_shift($pks);
 
 			$this->table->reset();
 
-			// [5085] only allow copy if user may edit this item.
+			// [5249] only allow copy if user may edit this item.
 
 			if (!$this->user->authorise('intervention.edit', $contexts[$pk]))
 
 			{
 
-				// [5095] Not fatal error
+				// [5259] Not fatal error
 
 				$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 
@@ -621,19 +621,19 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 
 			}
 
-			// [5100] Check that the row actually exists
+			// [5264] Check that the row actually exists
 			if (!$this->table->load($pk))
 			{
 				if ($error = $this->table->getError())
 				{
-					// [5105] Fatal error
+					// [5269] Fatal error
 					$this->setError($error);
 
 					return false;
 				}
 				else
 				{
-					// [5112] Not fatal error
+					// [5276] Not fatal error
 					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 					continue;
 				}
@@ -641,7 +641,7 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 
 			$this->table->name = $this->generateUniqe('name',$this->table->name);
 
-			// [5148] insert all set values
+			// [5312] insert all set values
 			if (CostbenefitprojectionHelper::checkArray($values))
 			{
 				foreach ($values as $key => $value)
@@ -653,7 +653,7 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 				}
 			}
 
-			// [5160] update all uniqe fields
+			// [5324] update all uniqe fields
 			if (CostbenefitprojectionHelper::checkArray($uniqeFields))
 			{
 				foreach ($uniqeFields as $uniqeField)
@@ -662,13 +662,13 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 				}
 			}
 
-			// [5169] Reset the ID because we are making a copy
+			// [5333] Reset the ID because we are making a copy
 			$this->table->id = 0;
 
-			// [5172] TODO: Deal with ordering?
-			// [5173] $this->table->ordering	= 1;
+			// [5336] TODO: Deal with ordering?
+			// [5337] $this->table->ordering	= 1;
 
-			// [5175] Check the row.
+			// [5339] Check the row.
 			if (!$this->table->check())
 			{
 				$this->setError($this->table->getError());
@@ -681,7 +681,7 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 				$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
 			}
 
-			// [5188] Store the row.
+			// [5352] Store the row.
 			if (!$this->table->store())
 			{
 				$this->setError($this->table->getError());
@@ -689,14 +689,14 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 				return false;
 			}
 
-			// [5196] Get the new item ID
+			// [5360] Get the new item ID
 			$newId = $this->table->get('id');
 
-			// [5199] Add the new ID to the array
+			// [5363] Add the new ID to the array
 			$newIds[$pk] = $newId;
 		}
 
-		// [5203] Clean the cache
+		// [5367] Clean the cache
 		$this->cleanCache();
 
 		return $newIds;
@@ -717,7 +717,7 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 	{
 		if (empty($this->batchSet))
 		{
-			// [4817] Set some needed variables.
+			// [4981] Set some needed variables.
 			$this->user		= JFactory::getUser();
 			$this->table		= $this->getTable();
 			$this->tableClassName	= get_class($this->table);
@@ -776,15 +776,15 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 			}
 		}
 
-		// [4839] make sure published only updates if user has the permission.
+		// [5003] make sure published only updates if user has the permission.
 		if (isset($values['published']) && !$this->canDo->get('intervention.edit.state'))
 		{
 			unset($values['published']);
 		}
-		// [4852] remove move_copy from array
+		// [5016] remove move_copy from array
 		unset($values['move_copy']);
 
-		// [4873] Parent exists so we proceed
+		// [5037] Parent exists so we proceed
 		foreach ($pks as $pk)
 		{
 			if (!$this->user->authorise('intervention.edit', $contexts[$pk]))
@@ -794,30 +794,30 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 				return false;
 			}
 
-			// [4890] Check that the row actually exists
+			// [5054] Check that the row actually exists
 			if (!$this->table->load($pk))
 			{
 				if ($error = $this->table->getError())
 				{
-					// [4895] Fatal error
+					// [5059] Fatal error
 					$this->setError($error);
 
 					return false;
 				}
 				else
 				{
-					// [4902] Not fatal error
+					// [5066] Not fatal error
 					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 					continue;
 				}
 			}
 
-			// [4908] insert all set values.
+			// [5072] insert all set values.
 			if (CostbenefitprojectionHelper::checkArray($values))
 			{
 				foreach ($values as $key => $value)
 				{
-					// [4913] Do special action for access.
+					// [5077] Do special action for access.
 					if ('access' == $key && strlen($value) > 0)
 					{
 						$this->table->$key = $value;
@@ -830,7 +830,7 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 			}
 
 
-			// [4925] Check the row.
+			// [5089] Check the row.
 			if (!$this->table->check())
 			{
 				$this->setError($this->table->getError());
@@ -843,7 +843,7 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 				$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
 			}
 
-			// [4938] Store the row.
+			// [5102] Store the row.
 			if (!$this->table->store())
 			{
 				$this->setError($this->table->getError());
@@ -852,7 +852,7 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 			}
 		}
 
-		// [4947] Clean the cache
+		// [5111] Clean the cache
 		$this->cleanCache();
 
 		return true;
@@ -882,7 +882,7 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 			$data['metadata'] = (string) $metadata;
 		} 
 
-		// [4169] Set the interventions string to JSON string.
+		// [4333] Set the interventions string to JSON string.
 		if (isset($data['interventions']))
 		{
 			$data['interventions'] = (string) json_encode($data['interventions']);
@@ -896,10 +896,10 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 			$data['params'] = (string) $params;
 		}
 
-		// [5295] Alter the uniqe field for save as copy
+		// [5459] Alter the uniqe field for save as copy
 		if ($input->get('task') == 'save2copy')
 		{
-			// [5298] Automatic handling of other uniqe fields
+			// [5462] Automatic handling of other uniqe fields
 			$uniqeFields = $this->getUniqeFields();
 			if (CostbenefitprojectionHelper::checkArray($uniqeFields))
 			{
@@ -952,7 +952,7 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 	protected function _generateNewTitle($title)
 	{
 
-		// [5353] Alter the title
+		// [5517] 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 49ead22d..c78d4d3b 100644
--- a/admin/models/interventions.php
+++ b/admin/models/interventions.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		interventions.php
@@ -111,16 +111,16 @@ class CostbenefitprojectionModelInterventions extends JModelList
 	 */
 	public function getItems()
 	{ 
-		// [10621] check in items
+		// [10792] check in items
 		$this->checkInNow();
 
 		// load parent items
 		$items = parent::getItems();
 
-		// [10696] set values to display correctly.
+		// [10867] set values to display correctly.
 		if (CostbenefitprojectionHelper::checkArray($items))
 		{
-			// [10699] get user object.
+			// [10870] get user object.
 			$user = JFactory::getUser();
 			foreach ($items as $nr => &$item)
 			{
@@ -147,12 +147,12 @@ class CostbenefitprojectionModelInterventions extends JModelList
 			}
 		}  
 
-		// [10962] set selection value to a translatable value
+		// [11133] set selection value to a translatable value
 		if (CostbenefitprojectionHelper::checkArray($items))
 		{
 			foreach ($items as $nr => &$item)
 			{
-				// [10969] convert type
+				// [11140] convert type
 				$item->type = $this->selectionTranslation($item->type, 'type');
 			}
 		}
@@ -169,14 +169,14 @@ class CostbenefitprojectionModelInterventions extends JModelList
 	*/
 	public function selectionTranslation($value,$name)
 	{
-		// [10995] Array of type language strings
+		// [11166] Array of type language strings
 		if ($name == 'type')
 		{
 			$typeArray = array(
 				1 => 'COM_COSTBENEFITPROJECTION_INTERVENTION_SINGLE',
 				2 => 'COM_COSTBENEFITPROJECTION_INTERVENTION_CLUSTER'
 			);
-			// [11026] Now check if value is found in this array
+			// [11197] 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()
 	{
-		// [7482] Get the user object.
+		// [7649] Get the user object.
 		$user = JFactory::getUser();
-		// [7484] Create a new query object.
+		// [7651] Create a new query object.
 		$db = JFactory::getDBO();
 		$query = $db->getQuery(true);
 
-		// [7487] Select some fields
+		// [7654] Select some fields
 		$query->select('a.*');
 
-		// [7494] From the costbenefitprojection_item table
+		// [7661] 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
 			}
 		}
 
-		// [7635] From the costbenefitprojection_company table.
+		// [7802] 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') . ')');
 
-		// [7508] Filter by published state
+		// [7675] 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)');
 		}
-		// [7605] Filter by search.
+		// [7772] Filter by search.
 		$search = $this->getState('filter.search');
 		if (!empty($search))
 		{
@@ -250,28 +250,28 @@ class CostbenefitprojectionModelInterventions extends JModelList
 			}
 		}
 
-		// [7839] Filter by company.
+		// [8006] Filter by company.
 		if ($company = $this->getState('filter.company'))
 		{
 			$query->where('a.company = ' . $db->quote($db->escape($company, true)));
 		}
-		// [7848] Filter by Type.
+		// [8015] Filter by Type.
 		if ($type = $this->getState('filter.type'))
 		{
 			$query->where('a.type = ' . $db->quote($db->escape($type, true)));
 		}
-		// [7848] Filter by Coverage.
+		// [8015] Filter by Coverage.
 		if ($coverage = $this->getState('filter.coverage'))
 		{
 			$query->where('a.coverage = ' . $db->quote($db->escape($coverage, true)));
 		}
-		// [7848] Filter by Duration.
+		// [8015] Filter by Duration.
 		if ($duration = $this->getState('filter.duration'))
 		{
 			$query->where('a.duration = ' . $db->quote($db->escape($duration, true)));
 		}
 
-		// [7564] Add the list ordering clause.
+		// [7731] 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)
 	{
-		// [7272] setup the query
+		// [7439] setup the query
 		if (CostbenefitprojectionHelper::checkArray($pks))
 		{
-			// [7275] Get the user object.
+			// [7442] Get the user object.
 			$user = JFactory::getUser();
-			// [7277] Create a new query object.
+			// [7444] Create a new query object.
 			$db = JFactory::getDBO();
 			$query = $db->getQuery(true);
 
-			// [7280] Select some fields
+			// [7447] Select some fields
 			$query->select('a.*');
 
-			// [7282] From the costbenefitprojection_intervention table
+			// [7449] 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
 			}
 		}
 
-			// [7299] Order the results by ordering
+			// [7466] Order the results by ordering
 			$query->order('a.ordering  ASC');
 
-			// [7301] Load the items
+			// [7468] Load the items
 			$db->setQuery($query);
 			$db->execute();
 			if ($db->getNumRows())
 			{
 				$items = $db->loadObjectList();
 
-				// [10696] set values to display correctly.
+				// [10867] set values to display correctly.
 				if (CostbenefitprojectionHelper::checkArray($items))
 				{
-					// [10699] get user object.
+					// [10870] get user object.
 					$user = JFactory::getUser();
 					foreach ($items as $nr => &$item)
 					{
@@ -346,13 +346,13 @@ class CostbenefitprojectionModelInterventions extends JModelList
 							continue;
 						}
 
-						// [10909] unset the values we don't want exported.
+						// [11080] unset the values we don't want exported.
 						unset($item->asset_id);
 						unset($item->checked_out);
 						unset($item->checked_out_time);
 					}
 				}
-				// [10918] Add headers to items array.
+				// [11089] Add headers to items array.
 				$headers = $this->getExImPortHeaders();
 				if (CostbenefitprojectionHelper::checkObject($headers))
 				{
@@ -384,13 +384,13 @@ class CostbenefitprojectionModelInterventions extends JModelList
 	*/
 	public function getExImPortHeaders()
 	{
-		// [7321] Get a db connection.
+		// [7488] Get a db connection.
 		$db = JFactory::getDbo();
-		// [7323] get the columns
+		// [7490] get the columns
 		$columns = $db->getTableColumns("#__costbenefitprojection_intervention");
 		if (CostbenefitprojectionHelper::checkArray($columns))
 		{
-			// [7327] remove the headers you don't import/export.
+			// [7494] 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 = '')
 	{
-		// [10244] Compile the store id.
+		// [10415] 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()
 	{
-		// [10637] Get set check in time
+		// [10808] Get set check in time
 		$time = JComponentHelper::getParams('com_costbenefitprojection')->get('check_in');
 		
 		if ($time)
 		{
 
-			// [10642] Get a db connection.
+			// [10813] Get a db connection.
 			$db = JFactory::getDbo();
-			// [10644] reset query
+			// [10815] 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())
 			{
-				// [10652] Get Yesterdays date
+				// [10823] Get Yesterdays date
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// [10654] reset query
+				// [10825] reset query
 				$query = $db->getQuery(true);
 
-				// [10656] Fields to update.
+				// [10827] Fields to update.
 				$fields = array(
 					$db->quoteName('checked_out_time') . '=\'0000-00-00 00:00:00\'',
 					$db->quoteName('checked_out') . '=0'
 				);
 
-				// [10661] Conditions for which records should be updated.
+				// [10832] Conditions for which records should be updated.
 				$conditions = array(
 					$db->quoteName('checked_out') . '!=0', 
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);
 
-				// [10666] Check table
+				// [10837] 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 b2be9c2c..4917321f 100644
--- a/admin/models/scaling_factor.php
+++ b/admin/models/scaling_factor.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		scaling_factor.php
@@ -110,7 +110,7 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 	 * @since   1.6
 	 */
 	public function getForm($data = array(), $loadData = true)
-	{		// [9651] Get the form.
+	{		// [9818] 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;
 
-		// [9736] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first.
+		// [9903] 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');
 		}
-		// [9741] The back end uses id so we use that the rest of the time and set it to 0 by default.
+		// [9908] 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();
 
-		// [9747] Check for existing item.
-		// [9748] Modify the form based on Edit State access controls.
+		// [9914] Check for existing item.
+		// [9915] 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')))
 		{
-			// [9761] Disable fields for display.
+			// [9928] Disable fields for display.
 			$form->setFieldAttribute('ordering', 'disabled', 'true');
 			$form->setFieldAttribute('published', 'disabled', 'true');
-			// [9764] Disable fields while saving.
+			// [9931] Disable fields while saving.
 			$form->setFieldAttribute('ordering', 'filter', 'unset');
 			$form->setFieldAttribute('published', 'filter', 'unset');
 		}
-		// [9769] Modify the form based on Edit Creaded By access controls.
+		// [9936] Modify the form based on Edit Creaded By access controls.
 		if (!$user->authorise('core.edit.created_by', 'com_costbenefitprojection'))
 		{
-			// [9781] Disable fields for display.
+			// [9948] Disable fields for display.
 			$form->setFieldAttribute('created_by', 'disabled', 'true');
-			// [9783] Disable fields for display.
+			// [9950] Disable fields for display.
 			$form->setFieldAttribute('created_by', 'readonly', 'true');
-			// [9785] Disable fields while saving.
+			// [9952] Disable fields while saving.
 			$form->setFieldAttribute('created_by', 'filter', 'unset');
 		}
-		// [9788] Modify the form based on Edit Creaded Date access controls.
+		// [9955] Modify the form based on Edit Creaded Date access controls.
 		if (!$user->authorise('core.edit.created', 'com_costbenefitprojection'))
 		{
-			// [9800] Disable fields for display.
+			// [9967] Disable fields for display.
 			$form->setFieldAttribute('created', 'disabled', 'true');
-			// [9802] Disable fields while saving.
+			// [9969] Disable fields while saving.
 			$form->setFieldAttribute('created', 'filter', 'unset');
 		}
 
@@ -196,7 +196,7 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 			}
 
 			$user = JFactory::getUser();
-			// [9952] The record has been set. Check the record permissions.
+			// [10119] 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)
 		{
-			// [10039] The record has been set. Check the record permissions.
+			// [10206] 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;
 			}
 		}
-		// [10056] In the absense of better information, revert to the component permissions.
+		// [10223] 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')
 	{
-		// [9864] Check specific edit permission then general edit permission.
+		// [10031] 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'))
@@ -476,7 +476,7 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 	{
 		if (empty($this->batchSet))
 		{
-			// [5015] Set some needed variables.
+			// [5179] Set some needed variables.
 			$this->user 		= JFactory::getUser();
 			$this->table 		= $this->getTable();
 			$this->tableClassName	= get_class($this->table);
@@ -520,12 +520,12 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 			}
 		}
 
-		// [5035] get list of uniqe fields
+		// [5199] get list of uniqe fields
 		$uniqeFields = $this->getUniqeFields();
-		// [5037] remove move_copy from array
+		// [5201] remove move_copy from array
 		unset($values['move_copy']);
 
-		// [5040] make sure published is set
+		// [5204] make sure published is set
 		if (!isset($values['published']))
 		{
 			$values['published'] = 0;
@@ -537,21 +537,21 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 
 		$newIds = array();
 
-		// [5077] Parent exists so let's proceed
+		// [5241] Parent exists so let's proceed
 		while (!empty($pks))
 		{
-			// [5080] Pop the first ID off the stack
+			// [5244] Pop the first ID off the stack
 			$pk = array_shift($pks);
 
 			$this->table->reset();
 
-			// [5085] only allow copy if user may edit this item.
+			// [5249] only allow copy if user may edit this item.
 
 			if (!$this->user->authorise('scaling_factor.edit', $contexts[$pk]))
 
 			{
 
-				// [5095] Not fatal error
+				// [5259] Not fatal error
 
 				$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 
@@ -559,19 +559,19 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 
 			}
 
-			// [5100] Check that the row actually exists
+			// [5264] Check that the row actually exists
 			if (!$this->table->load($pk))
 			{
 				if ($error = $this->table->getError())
 				{
-					// [5105] Fatal error
+					// [5269] Fatal error
 					$this->setError($error);
 
 					return false;
 				}
 				else
 				{
-					// [5112] Not fatal error
+					// [5276] Not fatal error
 					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 					continue;
 				}
@@ -579,7 +579,7 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 
 			$this->table->causerisk = $this->generateUniqe('causerisk',$this->table->causerisk);
 
-			// [5148] insert all set values
+			// [5312] insert all set values
 			if (CostbenefitprojectionHelper::checkArray($values))
 			{
 				foreach ($values as $key => $value)
@@ -591,7 +591,7 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 				}
 			}
 
-			// [5160] update all uniqe fields
+			// [5324] update all uniqe fields
 			if (CostbenefitprojectionHelper::checkArray($uniqeFields))
 			{
 				foreach ($uniqeFields as $uniqeField)
@@ -600,13 +600,13 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 				}
 			}
 
-			// [5169] Reset the ID because we are making a copy
+			// [5333] Reset the ID because we are making a copy
 			$this->table->id = 0;
 
-			// [5172] TODO: Deal with ordering?
-			// [5173] $this->table->ordering	= 1;
+			// [5336] TODO: Deal with ordering?
+			// [5337] $this->table->ordering	= 1;
 
-			// [5175] Check the row.
+			// [5339] Check the row.
 			if (!$this->table->check())
 			{
 				$this->setError($this->table->getError());
@@ -619,7 +619,7 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 				$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
 			}
 
-			// [5188] Store the row.
+			// [5352] Store the row.
 			if (!$this->table->store())
 			{
 				$this->setError($this->table->getError());
@@ -627,14 +627,14 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 				return false;
 			}
 
-			// [5196] Get the new item ID
+			// [5360] Get the new item ID
 			$newId = $this->table->get('id');
 
-			// [5199] Add the new ID to the array
+			// [5363] Add the new ID to the array
 			$newIds[$pk] = $newId;
 		}
 
-		// [5203] Clean the cache
+		// [5367] Clean the cache
 		$this->cleanCache();
 
 		return $newIds;
@@ -655,7 +655,7 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 	{
 		if (empty($this->batchSet))
 		{
-			// [4817] Set some needed variables.
+			// [4981] Set some needed variables.
 			$this->user		= JFactory::getUser();
 			$this->table		= $this->getTable();
 			$this->tableClassName	= get_class($this->table);
@@ -700,15 +700,15 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 			}
 		}
 
-		// [4839] make sure published only updates if user has the permission.
+		// [5003] make sure published only updates if user has the permission.
 		if (isset($values['published']) && !$this->canDo->get('scaling_factor.edit.state'))
 		{
 			unset($values['published']);
 		}
-		// [4852] remove move_copy from array
+		// [5016] remove move_copy from array
 		unset($values['move_copy']);
 
-		// [4873] Parent exists so we proceed
+		// [5037] Parent exists so we proceed
 		foreach ($pks as $pk)
 		{
 			if (!$this->user->authorise('scaling_factor.edit', $contexts[$pk]))
@@ -718,30 +718,30 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 				return false;
 			}
 
-			// [4890] Check that the row actually exists
+			// [5054] Check that the row actually exists
 			if (!$this->table->load($pk))
 			{
 				if ($error = $this->table->getError())
 				{
-					// [4895] Fatal error
+					// [5059] Fatal error
 					$this->setError($error);
 
 					return false;
 				}
 				else
 				{
-					// [4902] Not fatal error
+					// [5066] Not fatal error
 					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 					continue;
 				}
 			}
 
-			// [4908] insert all set values.
+			// [5072] insert all set values.
 			if (CostbenefitprojectionHelper::checkArray($values))
 			{
 				foreach ($values as $key => $value)
 				{
-					// [4913] Do special action for access.
+					// [5077] Do special action for access.
 					if ('access' == $key && strlen($value) > 0)
 					{
 						$this->table->$key = $value;
@@ -754,7 +754,7 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 			}
 
 
-			// [4925] Check the row.
+			// [5089] Check the row.
 			if (!$this->table->check())
 			{
 				$this->setError($this->table->getError());
@@ -767,7 +767,7 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 				$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
 			}
 
-			// [4938] Store the row.
+			// [5102] Store the row.
 			if (!$this->table->store())
 			{
 				$this->setError($this->table->getError());
@@ -776,7 +776,7 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 			}
 		}
 
-		// [4947] Clean the cache
+		// [5111] Clean the cache
 		$this->cleanCache();
 
 		return true;
@@ -814,10 +814,10 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 			$data['params'] = (string) $params;
 		}
 
-		// [5295] Alter the uniqe field for save as copy
+		// [5459] Alter the uniqe field for save as copy
 		if ($input->get('task') == 'save2copy')
 		{
-			// [5298] Automatic handling of other uniqe fields
+			// [5462] Automatic handling of other uniqe fields
 			$uniqeFields = $this->getUniqeFields();
 			if (CostbenefitprojectionHelper::checkArray($uniqeFields))
 			{
@@ -870,7 +870,7 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 	protected function _generateNewTitle($title)
 	{
 
-		// [5353] Alter the title
+		// [5517] 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 9e13627b..03d37f30 100644
--- a/admin/models/scaling_factors.php
+++ b/admin/models/scaling_factors.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		scaling_factors.php
@@ -119,16 +119,16 @@ class CostbenefitprojectionModelScaling_factors extends JModelList
 	 */
 	public function getItems()
 	{ 
-		// [10621] check in items
+		// [10792] check in items
 		$this->checkInNow();
 
 		// load parent items
 		$items = parent::getItems();
 
-		// [10696] set values to display correctly.
+		// [10867] set values to display correctly.
 		if (CostbenefitprojectionHelper::checkArray($items))
 		{
-			// [10699] get user object.
+			// [10870] get user object.
 			$user = JFactory::getUser();
 			foreach ($items as $nr => &$item)
 			{
@@ -153,16 +153,16 @@ class CostbenefitprojectionModelScaling_factors extends JModelList
 	 */
 	protected function getListQuery()
 	{
-		// [7482] Get the user object.
+		// [7649] Get the user object.
 		$user = JFactory::getUser();
-		// [7484] Create a new query object.
+		// [7651] Create a new query object.
 		$db = JFactory::getDBO();
 		$query = $db->getQuery(true);
 
-		// [7487] Select some fields
+		// [7654] Select some fields
 		$query->select('a.*');
 
-		// [7494] From the costbenefitprojection_item table
+		// [7661] 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
 			}
 		}
 
-		// [7635] From the costbenefitprojection_causerisk table.
+		// [7802] 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') . ')');
 
-		// [7635] From the costbenefitprojection_company table.
+		// [7802] 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') . ')');
 
-		// [7508] Filter by published state
+		// [7675] 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)');
 		}
-		// [7605] Filter by search.
+		// [7772] Filter by search.
 		$search = $this->getState('filter.search');
 		if (!empty($search))
 		{
@@ -215,18 +215,18 @@ class CostbenefitprojectionModelScaling_factors extends JModelList
 			}
 		}
 
-		// [7839] Filter by causerisk.
+		// [8006] Filter by causerisk.
 		if ($causerisk = $this->getState('filter.causerisk'))
 		{
 			$query->where('a.causerisk = ' . $db->quote($db->escape($causerisk, true)));
 		}
-		// [7839] Filter by company.
+		// [8006] Filter by company.
 		if ($company = $this->getState('filter.company'))
 		{
 			$query->where('a.company = ' . $db->quote($db->escape($company, true)));
 		}
 
-		// [7564] Add the list ordering clause.
+		// [7731] 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)
 	{
-		// [7272] setup the query
+		// [7439] setup the query
 		if (CostbenefitprojectionHelper::checkArray($pks))
 		{
-			// [7275] Get the user object.
+			// [7442] Get the user object.
 			$user = JFactory::getUser();
-			// [7277] Create a new query object.
+			// [7444] Create a new query object.
 			$db = JFactory::getDBO();
 			$query = $db->getQuery(true);
 
-			// [7280] Select some fields
+			// [7447] Select some fields
 			$query->select('a.*');
 
-			// [7282] From the costbenefitprojection_scaling_factor table
+			// [7449] 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
 			}
 		}
 
-			// [7299] Order the results by ordering
+			// [7466] Order the results by ordering
 			$query->order('a.ordering  ASC');
 
-			// [7301] Load the items
+			// [7468] Load the items
 			$db->setQuery($query);
 			$db->execute();
 			if ($db->getNumRows())
 			{
 				$items = $db->loadObjectList();
 
-				// [10696] set values to display correctly.
+				// [10867] set values to display correctly.
 				if (CostbenefitprojectionHelper::checkArray($items))
 				{
-					// [10699] get user object.
+					// [10870] get user object.
 					$user = JFactory::getUser();
 					foreach ($items as $nr => &$item)
 					{
@@ -301,13 +301,13 @@ class CostbenefitprojectionModelScaling_factors extends JModelList
 							continue;
 						}
 
-						// [10909] unset the values we don't want exported.
+						// [11080] unset the values we don't want exported.
 						unset($item->asset_id);
 						unset($item->checked_out);
 						unset($item->checked_out_time);
 					}
 				}
-				// [10918] Add headers to items array.
+				// [11089] Add headers to items array.
 				$headers = $this->getExImPortHeaders();
 				if (CostbenefitprojectionHelper::checkObject($headers))
 				{
@@ -326,13 +326,13 @@ class CostbenefitprojectionModelScaling_factors extends JModelList
 	*/
 	public function getExImPortHeaders()
 	{
-		// [7321] Get a db connection.
+		// [7488] Get a db connection.
 		$db = JFactory::getDbo();
-		// [7323] get the columns
+		// [7490] get the columns
 		$columns = $db->getTableColumns("#__costbenefitprojection_scaling_factor");
 		if (CostbenefitprojectionHelper::checkArray($columns))
 		{
-			// [7327] remove the headers you don't import/export.
+			// [7494] 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 = '')
 	{
-		// [10244] Compile the store id.
+		// [10415] 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()
 	{
-		// [10637] Get set check in time
+		// [10808] Get set check in time
 		$time = JComponentHelper::getParams('com_costbenefitprojection')->get('check_in');
 		
 		if ($time)
 		{
 
-			// [10642] Get a db connection.
+			// [10813] Get a db connection.
 			$db = JFactory::getDbo();
-			// [10644] reset query
+			// [10815] 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())
 			{
-				// [10652] Get Yesterdays date
+				// [10823] Get Yesterdays date
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// [10654] reset query
+				// [10825] reset query
 				$query = $db->getQuery(true);
 
-				// [10656] Fields to update.
+				// [10827] Fields to update.
 				$fields = array(
 					$db->quoteName('checked_out_time') . '=\'0000-00-00 00:00:00\'',
 					$db->quoteName('checked_out') . '=0'
 				);
 
-				// [10661] Conditions for which records should be updated.
+				// [10832] Conditions for which records should be updated.
 				$conditions = array(
 					$db->quoteName('checked_out') . '!=0', 
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);
 
-				// [10666] Check table
+				// [10837] 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 94a83f6b..3a471349 100644
--- a/admin/models/service_provider.php
+++ b/admin/models/service_provider.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		service_provider.php
@@ -95,7 +95,7 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 				$item->tags->getTagIds($item->id, 'com_costbenefitprojection.service_provider');
 			}
 		}
-		$this->serviceprovidernobe = $item->id;
+		$this->serviceproviderdpjh = $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 getOgncompanies()
+	public function getKfzcompanies()
 	{
-		// [7030] Get the user object.
+		// [7197] Get the user object.
 		$user = JFactory::getUser();
-		// [7032] Create a new query object.
+		// [7199] Create a new query object.
 		$db = JFactory::getDBO();
 		$query = $db->getQuery(true);
 
-		// [7035] Select some fields
+		// [7202] Select some fields
 		$query->select('a.*');
 
-		// [7042] From the costbenefitprojection_company table
+		// [7209] 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
 			}
 		}
 
-		// [7635] From the users table.
+		// [7802] 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') . ')');
 
-		// [7635] From the costbenefitprojection_country table.
+		// [7802] 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') . ')');
 
-		// [7635] From the costbenefitprojection_service_provider table.
+		// [7802] 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') . ')');
 
-		// [7058] Filter by serviceprovidernobe global.
-		$serviceprovidernobe = $this->serviceprovidernobe;
-		if (is_numeric($serviceprovidernobe ))
+		// [7225] Filter by serviceproviderdpjh global.
+		$serviceproviderdpjh = $this->serviceproviderdpjh;
+		if (is_numeric($serviceproviderdpjh ))
 		{
-			$query->where('a.serviceprovider = ' . (int) $serviceprovidernobe );
+			$query->where('a.serviceprovider = ' . (int) $serviceproviderdpjh );
 		}
-		elseif (is_string($serviceprovidernobe))
+		elseif (is_string($serviceproviderdpjh))
 		{
-			$query->where('a.serviceprovider = ' . $db->quote($serviceprovidernobe));
+			$query->where('a.serviceprovider = ' . $db->quote($serviceproviderdpjh));
 		}
 		else
 		{
 			$query->where('a.serviceprovider = -5');
 		}
 
-		// [7075] Join over the asset groups.
+		// [7242] Join over the asset groups.
 		$query->select('ag.title AS access_level');
 		$query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
-		// [7078] Filter by access level.
+		// [7245] Filter by access level.
 		if ($access = $this->getState('filter.access'))
 		{
 			$query->where('a.access = ' . (int) $access);
 		}
-		// [7083] Implement View Level Access
+		// [7250] Implement View Level Access
 		if (!$user->authorise('core.options', 'com_costbenefitprojection'))
 		{
 			$groups = implode(',', $user->getAuthorisedViewLevels());
 			$query->where('a.access IN (' . $groups . ')');
 		}
 
-		// [7090] Order the results by ordering
+		// [7257] Order the results by ordering
 		$query->order('a.ordering  ASC');
 
-		// [7092] Load the items
+		// [7259] Load the items
 		$db->setQuery($query);
 		$db->execute();
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [10696] set values to display correctly.
+			// [10867] set values to display correctly.
 			if (CostbenefitprojectionHelper::checkArray($items))
 			{
-				// [10699] get user object.
+				// [10870] get user object.
 				$user = JFactory::getUser();
 				foreach ($items as $nr => &$item)
 				{
@@ -205,15 +205,15 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 				}
 			}
 
-			// [10962] set selection value to a translatable value
+			// [11133] set selection value to a translatable value
 			if (CostbenefitprojectionHelper::checkArray($items))
 			{
 				foreach ($items as $nr => &$item)
 				{
-					// [10969] convert department
-					$item->department = $this->selectionTranslationOgncompanies($item->department, 'department');
-					// [10969] convert per
-					$item->per = $this->selectionTranslationOgncompanies($item->per, 'per');
+					// [11140] convert department
+					$item->department = $this->selectionTranslationKfzcompanies($item->department, 'department');
+					// [11140] convert per
+					$item->per = $this->selectionTranslationKfzcompanies($item->per, 'per');
 				}
 			}
 
@@ -227,29 +227,29 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 	*
 	* @return translatable string
 	*/
-	public function selectionTranslationOgncompanies($value,$name)
+	public function selectionTranslationKfzcompanies($value,$name)
 	{
-		// [10995] Array of department language strings
+		// [11166] Array of department language strings
 		if ($name == 'department')
 		{
 			$departmentArray = array(
 				1 => 'COM_COSTBENEFITPROJECTION_COMPANY_BASIC',
 				2 => 'COM_COSTBENEFITPROJECTION_COMPANY_ADVANCED'
 			);
-			// [11026] Now check if value is found in this array
+			// [11197] Now check if value is found in this array
 			if (isset($departmentArray[$value]) && CostbenefitprojectionHelper::checkString($departmentArray[$value]))
 			{
 				return $departmentArray[$value];
 			}
 		}
-		// [10995] Array of per language strings
+		// [11166] Array of per language strings
 		if ($name == 'per')
 		{
 			$perArray = array(
 				1 => 'COM_COSTBENEFITPROJECTION_COMPANY_OPEN',
 				0 => 'COM_COSTBENEFITPROJECTION_COMPANY_LOCKED'
 			);
-			// [11026] Now check if value is found in this array
+			// [11197] 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)
-	{		// [9651] Get the form.
+	{		// [9818] 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;
 
-		// [9736] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first.
+		// [9903] 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');
 		}
-		// [9741] The back end uses id so we use that the rest of the time and set it to 0 by default.
+		// [9908] 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();
 
-		// [9747] Check for existing item.
-		// [9748] Modify the form based on Edit State access controls.
+		// [9914] Check for existing item.
+		// [9915] 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')))
 		{
-			// [9761] Disable fields for display.
+			// [9928] Disable fields for display.
 			$form->setFieldAttribute('ordering', 'disabled', 'true');
 			$form->setFieldAttribute('published', 'disabled', 'true');
-			// [9764] Disable fields while saving.
+			// [9931] Disable fields while saving.
 			$form->setFieldAttribute('ordering', 'filter', 'unset');
 			$form->setFieldAttribute('published', 'filter', 'unset');
 		}
-		// [9769] Modify the form based on Edit Creaded By access controls.
+		// [9936] Modify the form based on Edit Creaded By access controls.
 		if (!$user->authorise('core.edit.created_by', 'com_costbenefitprojection'))
 		{
-			// [9781] Disable fields for display.
+			// [9948] Disable fields for display.
 			$form->setFieldAttribute('created_by', 'disabled', 'true');
-			// [9783] Disable fields for display.
+			// [9950] Disable fields for display.
 			$form->setFieldAttribute('created_by', 'readonly', 'true');
-			// [9785] Disable fields while saving.
+			// [9952] Disable fields while saving.
 			$form->setFieldAttribute('created_by', 'filter', 'unset');
 		}
-		// [9788] Modify the form based on Edit Creaded Date access controls.
+		// [9955] Modify the form based on Edit Creaded Date access controls.
 		if (!$user->authorise('core.edit.created', 'com_costbenefitprojection'))
 		{
-			// [9800] Disable fields for display.
+			// [9967] Disable fields for display.
 			$form->setFieldAttribute('created', 'disabled', 'true');
-			// [9802] Disable fields while saving.
+			// [9969] Disable fields while saving.
 			$form->setFieldAttribute('created', 'filter', 'unset');
 		}
 
@@ -355,7 +355,7 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 			}
 
 			$user = JFactory::getUser();
-			// [9952] The record has been set. Check the record permissions.
+			// [10119] 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)
 		{
-			// [10039] The record has been set. Check the record permissions.
+			// [10206] 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;
 			}
 		}
-		// [10056] In the absense of better information, revert to the component permissions.
+		// [10223] 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')
 	{
-		// [9864] Check specific edit permission then general edit permission.
+		// [10031] 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'))
@@ -634,7 +634,7 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 	{
 		if (empty($this->batchSet))
 		{
-			// [5015] Set some needed variables.
+			// [5179] Set some needed variables.
 			$this->user 		= JFactory::getUser();
 			$this->table 		= $this->getTable();
 			$this->tableClassName	= get_class($this->table);
@@ -678,12 +678,12 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 			}
 		}
 
-		// [5035] get list of uniqe fields
+		// [5199] get list of uniqe fields
 		$uniqeFields = $this->getUniqeFields();
-		// [5037] remove move_copy from array
+		// [5201] remove move_copy from array
 		unset($values['move_copy']);
 
-		// [5040] make sure published is set
+		// [5204] make sure published is set
 		if (!isset($values['published']))
 		{
 			$values['published'] = 0;
@@ -695,21 +695,21 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 
 		$newIds = array();
 
-		// [5077] Parent exists so let's proceed
+		// [5241] Parent exists so let's proceed
 		while (!empty($pks))
 		{
-			// [5080] Pop the first ID off the stack
+			// [5244] Pop the first ID off the stack
 			$pk = array_shift($pks);
 
 			$this->table->reset();
 
-			// [5085] only allow copy if user may edit this item.
+			// [5249] only allow copy if user may edit this item.
 
 			if (!$this->user->authorise('service_provider.edit', $contexts[$pk]))
 
 			{
 
-				// [5095] Not fatal error
+				// [5259] Not fatal error
 
 				$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 
@@ -717,25 +717,25 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 
 			}
 
-			// [5100] Check that the row actually exists
+			// [5264] Check that the row actually exists
 			if (!$this->table->load($pk))
 			{
 				if ($error = $this->table->getError())
 				{
-					// [5105] Fatal error
+					// [5269] Fatal error
 					$this->setError($error);
 
 					return false;
 				}
 				else
 				{
-					// [5112] Not fatal error
+					// [5276] Not fatal error
 					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 					continue;
 				}
 			}
 
-			// [5148] insert all set values
+			// [5312] insert all set values
 			if (CostbenefitprojectionHelper::checkArray($values))
 			{
 				foreach ($values as $key => $value)
@@ -747,7 +747,7 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 				}
 			}
 
-			// [5160] update all uniqe fields
+			// [5324] update all uniqe fields
 			if (CostbenefitprojectionHelper::checkArray($uniqeFields))
 			{
 				foreach ($uniqeFields as $uniqeField)
@@ -756,13 +756,13 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 				}
 			}
 
-			// [5169] Reset the ID because we are making a copy
+			// [5333] Reset the ID because we are making a copy
 			$this->table->id = 0;
 
-			// [5172] TODO: Deal with ordering?
-			// [5173] $this->table->ordering	= 1;
+			// [5336] TODO: Deal with ordering?
+			// [5337] $this->table->ordering	= 1;
 
-			// [5175] Check the row.
+			// [5339] Check the row.
 			if (!$this->table->check())
 			{
 				$this->setError($this->table->getError());
@@ -775,7 +775,7 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 				$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
 			}
 
-			// [5188] Store the row.
+			// [5352] Store the row.
 			if (!$this->table->store())
 			{
 				$this->setError($this->table->getError());
@@ -783,14 +783,14 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 				return false;
 			}
 
-			// [5196] Get the new item ID
+			// [5360] Get the new item ID
 			$newId = $this->table->get('id');
 
-			// [5199] Add the new ID to the array
+			// [5363] Add the new ID to the array
 			$newIds[$pk] = $newId;
 		}
 
-		// [5203] Clean the cache
+		// [5367] Clean the cache
 		$this->cleanCache();
 
 		return $newIds;
@@ -811,7 +811,7 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 	{
 		if (empty($this->batchSet))
 		{
-			// [4817] Set some needed variables.
+			// [4981] Set some needed variables.
 			$this->user		= JFactory::getUser();
 			$this->table		= $this->getTable();
 			$this->tableClassName	= get_class($this->table);
@@ -855,15 +855,15 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 			}
 		}
 
-		// [4839] make sure published only updates if user has the permission.
+		// [5003] make sure published only updates if user has the permission.
 		if (isset($values['published']) && !$this->canDo->get('service_provider.edit.state'))
 		{
 			unset($values['published']);
 		}
-		// [4852] remove move_copy from array
+		// [5016] remove move_copy from array
 		unset($values['move_copy']);
 
-		// [4873] Parent exists so we proceed
+		// [5037] Parent exists so we proceed
 		foreach ($pks as $pk)
 		{
 			if (!$this->user->authorise('service_provider.edit', $contexts[$pk]))
@@ -873,30 +873,30 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 				return false;
 			}
 
-			// [4890] Check that the row actually exists
+			// [5054] Check that the row actually exists
 			if (!$this->table->load($pk))
 			{
 				if ($error = $this->table->getError())
 				{
-					// [4895] Fatal error
+					// [5059] Fatal error
 					$this->setError($error);
 
 					return false;
 				}
 				else
 				{
-					// [4902] Not fatal error
+					// [5066] Not fatal error
 					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 					continue;
 				}
 			}
 
-			// [4908] insert all set values.
+			// [5072] insert all set values.
 			if (CostbenefitprojectionHelper::checkArray($values))
 			{
 				foreach ($values as $key => $value)
 				{
-					// [4913] Do special action for access.
+					// [5077] Do special action for access.
 					if ('access' == $key && strlen($value) > 0)
 					{
 						$this->table->$key = $value;
@@ -909,7 +909,7 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 			}
 
 
-			// [4925] Check the row.
+			// [5089] Check the row.
 			if (!$this->table->check())
 			{
 				$this->setError($this->table->getError());
@@ -922,7 +922,7 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 				$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
 			}
 
-			// [4938] Store the row.
+			// [5102] Store the row.
 			if (!$this->table->store())
 			{
 				$this->setError($this->table->getError());
@@ -931,7 +931,7 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 			}
 		}
 
-		// [4947] Clean the cache
+		// [5111] Clean the cache
 		$this->cleanCache();
 
 		return true;
@@ -969,10 +969,10 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 			$data['params'] = (string) $params;
 		}
 
-		// [5295] Alter the uniqe field for save as copy
+		// [5459] Alter the uniqe field for save as copy
 		if ($input->get('task') == 'save2copy')
 		{
-			// [5298] Automatic handling of other uniqe fields
+			// [5462] Automatic handling of other uniqe fields
 			$uniqeFields = $this->getUniqeFields();
 			if (CostbenefitprojectionHelper::checkArray($uniqeFields))
 			{
@@ -1025,7 +1025,7 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 	protected function _generateNewTitle($title)
 	{
 
-		// [5353] Alter the title
+		// [5517] 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 e8996cd8..45a32db7 100644
--- a/admin/models/service_providers.php
+++ b/admin/models/service_providers.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		service_providers.php
@@ -107,16 +107,16 @@ class CostbenefitprojectionModelService_providers extends JModelList
 	 */
 	public function getItems()
 	{ 
-		// [10621] check in items
+		// [10792] check in items
 		$this->checkInNow();
 
 		// load parent items
 		$items = parent::getItems();
 
-		// [10696] set values to display correctly.
+		// [10867] set values to display correctly.
 		if (CostbenefitprojectionHelper::checkArray($items))
 		{
-			// [10699] get user object.
+			// [10870] get user object.
 			$user = JFactory::getUser();
 			foreach ($items as $nr => &$item)
 			{
@@ -141,16 +141,16 @@ class CostbenefitprojectionModelService_providers extends JModelList
 	 */
 	protected function getListQuery()
 	{
-		// [7482] Get the user object.
+		// [7649] Get the user object.
 		$user = JFactory::getUser();
-		// [7484] Create a new query object.
+		// [7651] Create a new query object.
 		$db = JFactory::getDBO();
 		$query = $db->getQuery(true);
 
-		// [7487] Select some fields
+		// [7654] Select some fields
 		$query->select('a.*');
 
-		// [7494] From the costbenefitprojection_item table
+		// [7661] 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
 			}
 		}
 
-		// [7635] From the users table.
+		// [7802] 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') . ')');
 
-		// [7635] From the costbenefitprojection_country table.
+		// [7802] 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') . ')');
 
-		// [7508] Filter by published state
+		// [7675] 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)');
 		}
-		// [7605] Filter by search.
+		// [7772] Filter by search.
 		$search = $this->getState('filter.search');
 		if (!empty($search))
 		{
@@ -203,13 +203,13 @@ class CostbenefitprojectionModelService_providers extends JModelList
 			}
 		}
 
-		// [7839] Filter by country.
+		// [8006] Filter by country.
 		if ($country = $this->getState('filter.country'))
 		{
 			$query->where('a.country = ' . $db->quote($db->escape($country, true)));
 		}
 
-		// [7564] Add the list ordering clause.
+		// [7731] 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)
 	{
-		// [7272] setup the query
+		// [7439] setup the query
 		if (CostbenefitprojectionHelper::checkArray($pks))
 		{
-			// [7275] Get the user object.
+			// [7442] Get the user object.
 			$user = JFactory::getUser();
-			// [7277] Create a new query object.
+			// [7444] Create a new query object.
 			$db = JFactory::getDBO();
 			$query = $db->getQuery(true);
 
-			// [7280] Select some fields
+			// [7447] Select some fields
 			$query->select('a.*');
 
-			// [7282] From the costbenefitprojection_service_provider table
+			// [7449] 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
 			}
 		}
 
-			// [7299] Order the results by ordering
+			// [7466] Order the results by ordering
 			$query->order('a.ordering  ASC');
 
-			// [7301] Load the items
+			// [7468] Load the items
 			$db->setQuery($query);
 			$db->execute();
 			if ($db->getNumRows())
 			{
 				$items = $db->loadObjectList();
 
-				// [10696] set values to display correctly.
+				// [10867] set values to display correctly.
 				if (CostbenefitprojectionHelper::checkArray($items))
 				{
-					// [10699] get user object.
+					// [10870] get user object.
 					$user = JFactory::getUser();
 					foreach ($items as $nr => &$item)
 					{
@@ -284,13 +284,13 @@ class CostbenefitprojectionModelService_providers extends JModelList
 							continue;
 						}
 
-						// [10909] unset the values we don't want exported.
+						// [11080] unset the values we don't want exported.
 						unset($item->asset_id);
 						unset($item->checked_out);
 						unset($item->checked_out_time);
 					}
 				}
-				// [10918] Add headers to items array.
+				// [11089] Add headers to items array.
 				$headers = $this->getExImPortHeaders();
 				if (CostbenefitprojectionHelper::checkObject($headers))
 				{
@@ -309,13 +309,13 @@ class CostbenefitprojectionModelService_providers extends JModelList
 	*/
 	public function getExImPortHeaders()
 	{
-		// [7321] Get a db connection.
+		// [7488] Get a db connection.
 		$db = JFactory::getDbo();
-		// [7323] get the columns
+		// [7490] get the columns
 		$columns = $db->getTableColumns("#__costbenefitprojection_service_provider");
 		if (CostbenefitprojectionHelper::checkArray($columns))
 		{
-			// [7327] remove the headers you don't import/export.
+			// [7494] 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 = '')
 	{
-		// [10244] Compile the store id.
+		// [10415] 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()
 	{
-		// [10637] Get set check in time
+		// [10808] Get set check in time
 		$time = JComponentHelper::getParams('com_costbenefitprojection')->get('check_in');
 		
 		if ($time)
 		{
 
-			// [10642] Get a db connection.
+			// [10813] Get a db connection.
 			$db = JFactory::getDbo();
-			// [10644] reset query
+			// [10815] 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())
 			{
-				// [10652] Get Yesterdays date
+				// [10823] Get Yesterdays date
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// [10654] reset query
+				// [10825] reset query
 				$query = $db->getQuery(true);
 
-				// [10656] Fields to update.
+				// [10827] Fields to update.
 				$fields = array(
 					$db->quoteName('checked_out_time') . '=\'0000-00-00 00:00:00\'',
 					$db->quoteName('checked_out') . '=0'
 				);
 
-				// [10661] Conditions for which records should be updated.
+				// [10832] Conditions for which records should be updated.
 				$conditions = array(
 					$db->quoteName('checked_out') . '!=0', 
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);
 
-				// [10666] Check table
+				// [10837] 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 d20421da..50baf888 100644
--- a/admin/tables/causerisk.php
+++ b/admin/tables/causerisk.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		causerisk.php
@@ -47,7 +47,7 @@ class CostbenefitprojectionTableCauserisk extends JTable
 	{
 		parent::__construct('#__costbenefitprojection_causerisk', 'id', $db);
 
-		// [4277] Adding History Options
+		// [4441] Adding History Options
 		JTableObserverContenthistory::createObserver($this, array('typeAlias' => 'com_costbenefitprojection.causerisk')); 
 	}	
  
diff --git a/admin/tables/company.php b/admin/tables/company.php
index 60529c72..2a432828 100644
--- a/admin/tables/company.php
+++ b/admin/tables/company.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		company.php
@@ -47,7 +47,7 @@ class CostbenefitprojectionTableCompany extends JTable
 	{
 		parent::__construct('#__costbenefitprojection_company', 'id', $db);
 
-		// [4277] Adding History Options
+		// [4441] Adding History Options
 		JTableObserverContenthistory::createObserver($this, array('typeAlias' => 'com_costbenefitprojection.company')); 
 	}	
  
diff --git a/admin/tables/country.php b/admin/tables/country.php
index e2add5c4..9e90b9d4 100644
--- a/admin/tables/country.php
+++ b/admin/tables/country.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		country.php
@@ -47,7 +47,7 @@ class CostbenefitprojectionTableCountry extends JTable
 	{
 		parent::__construct('#__costbenefitprojection_country', 'id', $db);
 
-		// [4277] Adding History Options
+		// [4441] Adding History Options
 		JTableObserverContenthistory::createObserver($this, array('typeAlias' => 'com_costbenefitprojection.country')); 
 	}	
  
diff --git a/admin/tables/currency.php b/admin/tables/currency.php
index 8a110da6..2ece2a14 100644
--- a/admin/tables/currency.php
+++ b/admin/tables/currency.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		currency.php
@@ -47,7 +47,7 @@ class CostbenefitprojectionTableCurrency extends JTable
 	{
 		parent::__construct('#__costbenefitprojection_currency', 'id', $db);
 
-		// [4277] Adding History Options
+		// [4441] 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 174b9849..c6938ad4 100644
--- a/admin/tables/health_data.php
+++ b/admin/tables/health_data.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		health_data.php
@@ -47,7 +47,7 @@ class CostbenefitprojectionTableHealth_data extends JTable
 	{
 		parent::__construct('#__costbenefitprojection_health_data', 'id', $db);
 
-		// [4277] Adding History Options
+		// [4441] 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 e0dc47e4..38d3c676 100644
--- a/admin/tables/help_document.php
+++ b/admin/tables/help_document.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		help_document.php
@@ -47,7 +47,7 @@ class CostbenefitprojectionTableHelp_document extends JTable
 	{
 		parent::__construct('#__costbenefitprojection_help_document', 'id', $db);
 
-		// [4277] Adding History Options
+		// [4441] 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 3a81ef04..d3e6423b 100644
--- a/admin/tables/intervention.php
+++ b/admin/tables/intervention.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		intervention.php
@@ -47,7 +47,7 @@ class CostbenefitprojectionTableIntervention extends JTable
 	{
 		parent::__construct('#__costbenefitprojection_intervention', 'id', $db);
 
-		// [4277] Adding History Options
+		// [4441] 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 2a5eda92..775c58cb 100644
--- a/admin/tables/scaling_factor.php
+++ b/admin/tables/scaling_factor.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		scaling_factor.php
@@ -47,7 +47,7 @@ class CostbenefitprojectionTableScaling_factor extends JTable
 	{
 		parent::__construct('#__costbenefitprojection_scaling_factor', 'id', $db);
 
-		// [4277] Adding History Options
+		// [4441] 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 ec4931ca..5c279657 100644
--- a/admin/tables/service_provider.php
+++ b/admin/tables/service_provider.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		service_provider.php
@@ -47,7 +47,7 @@ class CostbenefitprojectionTableService_provider extends JTable
 	{
 		parent::__construct('#__costbenefitprojection_service_provider', 'id', $db);
 
-		// [4277] Adding History Options
+		// [4441] 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 e80ea1e1..53ef3769 100644
--- a/admin/views/causerisk/submitbutton.js
+++ b/admin/views/causerisk/submitbutton.js
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		submitbutton.js
diff --git a/admin/views/causerisk/tmpl/edit.php b/admin/views/causerisk/tmpl/edit.php
index d4c90b72..3293ff5e 100644
--- a/admin/views/causerisk/tmpl/edit.php
+++ b/admin/views/causerisk/tmpl/edit.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		edit.php
diff --git a/admin/views/causerisk/view.html.php b/admin/views/causerisk/view.html.php
index 0bc200a8..16aca0f6 100644
--- a/admin/views/causerisk/view.html.php
+++ b/admin/views/causerisk/view.html.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
@@ -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');
-		// [10354] Built the actions for new and existing records.
+		// [10525] Built the actions for new and existing records.
 		if ($this->refid || $this->ref)
 		{
 			if ($this->canDo->get('causerisk.create') && $isNew)
 			{
-				// [10366] We can create the record.
+				// [10537] We can create the record.
 				JToolBarHelper::save('causerisk.save', 'JTOOLBAR_SAVE');
 			}
 			elseif ($this->canDo->get('causerisk.edit'))
 			{
-				// [10378] We can save the record.
+				// [10549] We can save the record.
 				JToolBarHelper::save('causerisk.save', 'JTOOLBAR_SAVE');
 			}
 			if ($isNew)
 			{
-				// [10383] Do not creat but cancel.
+				// [10554] Do not creat but cancel.
 				JToolBarHelper::cancel('causerisk.cancel', 'JTOOLBAR_CANCEL');
 			}
 			else
 			{
-				// [10388] We can close it.
+				// [10559] We can close it.
 				JToolBarHelper::cancel('causerisk.cancel', 'JTOOLBAR_CLOSE');
 			}
 		}
@@ -114,7 +114,7 @@ class CostbenefitprojectionViewCauserisk extends JViewLegacy
 		{
 			if ($isNew)
 			{
-				// [10396] For new records, check the create permission.
+				// [10567] 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'))
 				{
-					// [10423] We can save the new record
+					// [10594] We can save the new record
 					JToolBarHelper::apply('causerisk.apply', 'JTOOLBAR_APPLY');
 					JToolBarHelper::save('causerisk.save', 'JTOOLBAR_SAVE');
-					// [10426] We can save this record, but check the create permission to see
-					// [10427] if we can return to make a new one.
+					// [10597] We can save this record, but check the create permission to see
+					// [10598] 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();
-		// [10463] set help url for this view if found
+		// [10634] 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 401e92e3..799fa984 100644
--- a/admin/views/causesrisks/tmpl/default.php
+++ b/admin/views/causesrisks/tmpl/default.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default.php
diff --git a/admin/views/causesrisks/tmpl/default_batch_body.php b/admin/views/causesrisks/tmpl/default_batch_body.php
index b8a02581..1da67f34 100644
--- a/admin/views/causesrisks/tmpl/default_batch_body.php
+++ b/admin/views/causesrisks/tmpl/default_batch_body.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_batch_body.php
diff --git a/admin/views/causesrisks/tmpl/default_batch_footer.php b/admin/views/causesrisks/tmpl/default_batch_footer.php
index 26551f79..241c7ec9 100644
--- a/admin/views/causesrisks/tmpl/default_batch_footer.php
+++ b/admin/views/causesrisks/tmpl/default_batch_footer.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_batch_footer.php
diff --git a/admin/views/causesrisks/tmpl/default_body.php b/admin/views/causesrisks/tmpl/default_body.php
index 2a845a78..2a3eadf3 100644
--- a/admin/views/causesrisks/tmpl/default_body.php
+++ b/admin/views/causesrisks/tmpl/default_body.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_body.php
diff --git a/admin/views/causesrisks/tmpl/default_foot.php b/admin/views/causesrisks/tmpl/default_foot.php
index 43b14f06..3f40846e 100644
--- a/admin/views/causesrisks/tmpl/default_foot.php
+++ b/admin/views/causesrisks/tmpl/default_foot.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_foot.php
diff --git a/admin/views/causesrisks/tmpl/default_head.php b/admin/views/causesrisks/tmpl/default_head.php
index 0e563608..c888a3c6 100644
--- a/admin/views/causesrisks/tmpl/default_head.php
+++ b/admin/views/causesrisks/tmpl/default_head.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_head.php
diff --git a/admin/views/causesrisks/tmpl/default_toolbar.php b/admin/views/causesrisks/tmpl/default_toolbar.php
index 7430f6a3..8578b7c6 100644
--- a/admin/views/causesrisks/tmpl/default_toolbar.php
+++ b/admin/views/causesrisks/tmpl/default_toolbar.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_toolbar.php
diff --git a/admin/views/causesrisks/view.html.php b/admin/views/causesrisks/view.html.php
index 5397e991..5a397584 100644
--- a/admin/views/causesrisks/view.html.php
+++ b/admin/views/causesrisks/view.html.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
diff --git a/admin/views/combinedresults/tmpl/default.php b/admin/views/combinedresults/tmpl/default.php
index 195730c0..12a8e48c 100644
--- a/admin/views/combinedresults/tmpl/default.php
+++ b/admin/views/combinedresults/tmpl/default.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default.php
diff --git a/admin/views/combinedresults/tmpl/default_chart_cost.php b/admin/views/combinedresults/tmpl/default_chart_cost.php
index 9699cf03..1ad5028f 100644
--- a/admin/views/combinedresults/tmpl/default_chart_cost.php
+++ b/admin/views/combinedresults/tmpl/default_chart_cost.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_cost.php
diff --git a/admin/views/combinedresults/tmpl/default_chart_cost_percent.php b/admin/views/combinedresults/tmpl/default_chart_cost_percent.php
index c6c38627..4492521d 100644
--- a/admin/views/combinedresults/tmpl/default_chart_cost_percent.php
+++ b/admin/views/combinedresults/tmpl/default_chart_cost_percent.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_cost_percent.php
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 4ed8e06c..fae2a4c2 100644
--- a/admin/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php
+++ b/admin/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_intervention_cost_benefit.php
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 02a74032..6593e348 100644
--- a/admin/views/combinedresults/tmpl/default_chart_work_days_lost.php
+++ b/admin/views/combinedresults/tmpl/default_chart_work_days_lost.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_work_days_lost.php
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 52160be9..5beb4703 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
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_work_days_lost_percent.php
diff --git a/admin/views/combinedresults/tmpl/default_main.php b/admin/views/combinedresults/tmpl/default_main.php
index dc12b3aa..26667c15 100644
--- a/admin/views/combinedresults/tmpl/default_main.php
+++ b/admin/views/combinedresults/tmpl/default_main.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_main.php
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 adeb42d5..7fb1ba3d 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
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_table_calculated_cost_in_detail.php
diff --git a/admin/views/combinedresults/tmpl/default_table_cost_summary.php b/admin/views/combinedresults/tmpl/default_table_cost_summary.php
index c83c0270..96366a0f 100644
--- a/admin/views/combinedresults/tmpl/default_table_cost_summary.php
+++ b/admin/views/combinedresults/tmpl/default_table_cost_summary.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_table_cost_summary.php
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 d413eaac..c611e0e6 100644
--- a/admin/views/combinedresults/tmpl/default_table_intervention_net_benefit.php
+++ b/admin/views/combinedresults/tmpl/default_table_intervention_net_benefit.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_table_intervention_net_benefit.php
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 812c5844..4ed352ea 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
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_table_work_days_lost_summary.php
diff --git a/admin/views/combinedresults/view.html.php b/admin/views/combinedresults/view.html.php
index 14c66bf5..bdfacf36 100644
--- a/admin/views/combinedresults/view.html.php
+++ b/admin/views/combinedresults/view.html.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
@@ -39,10 +39,10 @@ class CostbenefitprojectionViewCombinedresults extends JViewLegacy
 		$this->user	= JFactory::getUser();
                 // get global action permissions
 		$this->canDo	= CostbenefitprojectionHelper::getActions('combinedresults');
-		// [3083] Initialise variables.
+		// [3164] Initialise variables.
 		$this->items	= $this->get('Items');
 
-		// [3112] Check for errors.
+		// [3193] Check for errors.
 		if (count($errors = $this->get('Errors')))
 		{
 			JError::raiseWarning(500, implode("\n", $errors));
@@ -74,14 +74,14 @@ class CostbenefitprojectionViewCombinedresults extends JViewLegacy
 			$this->table_tabs = false;
 		}
 
-		// [3136] We don't need toolbar in the modal window.
+		// [3217] We don't need toolbar in the modal window.
 		if ($this->getLayout() !== 'modal')
 		{
-			// [3139] add the tool bar
+			// [3220] add the tool bar
 			$this->addToolBar();
 		}
 
-		// [3142] set the document
+		// [3223] set the document
 		$this->setDocument();
 
 		parent::display($tpl);
@@ -130,80 +130,80 @@ class CostbenefitprojectionViewCombinedresults extends JViewLegacy
 	protected function setDocument()
 	{
 
-		// [3485] always make sure jquery is loaded.
+		// [3566] always make sure jquery is loaded.
 		JHtml::_('jquery.framework');
-		// [3487] Load the header checker class.
+		// [3568] Load the header checker class.
 		require_once( JPATH_COMPONENT_SITE.'/helpers/headercheck.php' );
-		// [3489] Initialize the header checker.
+		// [3570] Initialize the header checker.
 		$HeaderCheck = new HeaderCheck;
 
-		// [3494] Load uikit options.
+		// [3575] Load uikit options.
 		$uikit = $this->params->get('uikit_load');
-		// [3496] Set script size.
+		// [3577] Set script size.
 		$size = $this->params->get('uikit_min');
-		// [3498] Set css style.
+		// [3579] Set css style.
 		$style = $this->params->get('uikit_style');
 
-		// [3501] The uikit css.
+		// [3582] 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');
 		}
-		// [3506] The uikit js.
+		// [3587] 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');
 		}
 
-		// [3571] Load the needed uikit components in this view.
+		// [3652] Load the needed uikit components in this view.
 		$uikitComp = $this->get('UikitComp');
 		if ($uikit != 2 && isset($uikitComp) && CostbenefitprojectionHelper::checkArray($uikitComp))
 		{
-			// [3575] load just in case.
+			// [3656] load just in case.
 			jimport('joomla.filesystem.file');
-			// [3577] loading...
+			// [3658] loading...
 			foreach ($uikitComp as $class)
 			{
 				foreach (CostbenefitprojectionHelper::$uk_components[$class] as $name)
 				{
-					// [3582] check if the CSS file exists.
+					// [3663] check if the CSS file exists.
 					if (JFile::exists(JPATH_ROOT.'/media/com_costbenefitprojection/uikit/css/components/'.$name.$style.$size.'.css'))
 					{
-						// [3585] load the css.
+						// [3666] load the css.
 						$this->document->addStyleSheet(JURI::root(true) .'/media/com_costbenefitprojection/uikit/css/components/'.$name.$style.$size.'.css');
 					}
-					// [3588] check if the JavaScript file exists.
+					// [3669] check if the JavaScript file exists.
 					if (JFile::exists(JPATH_ROOT.'/media/com_costbenefitprojection/uikit/js/components/'.$name.$size.'.js'))
 					{
-						// [3591] load the js.
+						// [3672] load the js.
 						$this->document->addScript(JURI::root(true) .'/media/com_costbenefitprojection/uikit/js/components/'.$name.$size.'.js');
 					}
 				}
 			}
 		} 
 
-		// [3467] add the google chart builder class.
+		// [3548] add the google chart builder class.
 		require_once JPATH_COMPONENT_ADMINISTRATOR.'/helpers/chartbuilder.php';
-		// [3469] load the google chart js.
+		// [3550] 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'); 
 
-		// [6599] Add the CSS for Footable.
+		// [6766] Add the CSS for Footable.
 		$this->document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable/css/footable.core.min.css');
 
-		// [6601] Use the Metro Style
+		// [6768] 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');
 		}
-		// [6606] Use the Legacy Style.
+		// [6773] 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');
 		}
 
-		// [6611] Add the JavaScript for Footable
+		// [6778] 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');
@@ -253,7 +253,7 @@ class CostbenefitprojectionViewCombinedresults extends JViewLegacy
 		JToolBarHelper::custom('combinedresults.dashboard', 'grid-2', '', 'COM_COSTBENEFITPROJECTION_DASH', false);
 		if ($this->canDo->get('combinedresults.companies'))
 		{
-			// [3266] add Companies button.
+			// [3347] 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 167bc900..2908ce2d 100644
--- a/admin/views/companies/tmpl/default.php
+++ b/admin/views/companies/tmpl/default.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default.php
diff --git a/admin/views/companies/tmpl/default_batch_body.php b/admin/views/companies/tmpl/default_batch_body.php
index 1283f529..0962b7ca 100644
--- a/admin/views/companies/tmpl/default_batch_body.php
+++ b/admin/views/companies/tmpl/default_batch_body.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_batch_body.php
diff --git a/admin/views/companies/tmpl/default_batch_footer.php b/admin/views/companies/tmpl/default_batch_footer.php
index e5a9f222..aa08dc0c 100644
--- a/admin/views/companies/tmpl/default_batch_footer.php
+++ b/admin/views/companies/tmpl/default_batch_footer.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_batch_footer.php
diff --git a/admin/views/companies/tmpl/default_body.php b/admin/views/companies/tmpl/default_body.php
index bf2775d5..fb2582b3 100644
--- a/admin/views/companies/tmpl/default_body.php
+++ b/admin/views/companies/tmpl/default_body.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_body.php
diff --git a/admin/views/companies/tmpl/default_foot.php b/admin/views/companies/tmpl/default_foot.php
index 8d0c624a..98b7c6ce 100644
--- a/admin/views/companies/tmpl/default_foot.php
+++ b/admin/views/companies/tmpl/default_foot.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_foot.php
diff --git a/admin/views/companies/tmpl/default_head.php b/admin/views/companies/tmpl/default_head.php
index 8c854a39..fb8ec9ff 100644
--- a/admin/views/companies/tmpl/default_head.php
+++ b/admin/views/companies/tmpl/default_head.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_head.php
diff --git a/admin/views/companies/tmpl/default_toolbar.php b/admin/views/companies/tmpl/default_toolbar.php
index 2ffa19be..e24a221b 100644
--- a/admin/views/companies/tmpl/default_toolbar.php
+++ b/admin/views/companies/tmpl/default_toolbar.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_toolbar.php
diff --git a/admin/views/companies/view.html.php b/admin/views/companies/view.html.php
index c8ee6db6..9ba31e26 100644
--- a/admin/views/companies/view.html.php
+++ b/admin/views/companies/view.html.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
@@ -130,7 +130,7 @@ class CostbenefitprojectionViewCompanies extends JViewLegacy
                                 $bar->appendButton('Custom', $dhtml, 'batch');
                         }		if ($this->canDo->get('combinedresults.access'))
 		{
-			// [7203] add Combined Results button.
+			// [7370] add Combined Results button.
 			JToolBarHelper::custom('companies.redirectToCombinedresults', 'cogs', '', 'COM_COSTBENEFITPROJECTION_COMBINEDRESULTS', true);
 		} 
 
@@ -200,11 +200,11 @@ class CostbenefitprojectionViewCompanies extends JViewLegacy
 			);
                 }  
 
-		// [9226] Set Department Selection
+		// [9393] Set Department Selection
 		$this->departmentOptions = $this->getTheDepartmentSelections();
 		if ($this->departmentOptions)
 		{
-			// [9230] Department Filter
+			// [9397] 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)
 			{
-				// [9239] Department Batch Selection
+				// [9406] Department Batch Selection
 				JHtmlBatch_::addListSelection(
 					'- Keep Original '.JText::_('COM_COSTBENEFITPROJECTION_COMPANY_DEPARTMENT_LABEL').' -',
 					'batch[department]',
@@ -222,11 +222,11 @@ class CostbenefitprojectionViewCompanies extends JViewLegacy
 			}
 		}
 
-		// [9192] Set Country Name Selection
+		// [9359] Set Country Name Selection
 		$this->countryNameOptions = JFormHelper::loadFieldType('Countries')->getOptions();
 		if ($this->countryNameOptions)
 		{
-			// [9196] Country Name Filter
+			// [9363] 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)
 			{
-				// [9205] Country Name Batch Selection
+				// [9372] Country Name Batch Selection
 				JHtmlBatch_::addListSelection(
 					'- Keep Original '.JText::_('COM_COSTBENEFITPROJECTION_COMPANY_COUNTRY_LABEL').' -',
 					'batch[country]',
@@ -244,11 +244,11 @@ class CostbenefitprojectionViewCompanies extends JViewLegacy
 			}
 		}
 
-		// [9192] Set Serviceprovider User Selection
+		// [9359] Set Serviceprovider User Selection
 		$this->serviceproviderUserOptions = JFormHelper::loadFieldType('Serviceprovider')->getOptions();
 		if ($this->serviceproviderUserOptions)
 		{
-			// [9196] Serviceprovider User Filter
+			// [9363] 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)
 			{
-				// [9205] Serviceprovider User Batch Selection
+				// [9372] Serviceprovider User Batch Selection
 				JHtmlBatch_::addListSelection(
 					'- Keep Original '.JText::_('COM_COSTBENEFITPROJECTION_COMPANY_SERVICEPROVIDER_LABEL').' -',
 					'batch[serviceprovider]',
@@ -266,11 +266,11 @@ class CostbenefitprojectionViewCompanies extends JViewLegacy
 			}
 		}
 
-		// [9226] Set Per Selection
+		// [9393] Set Per Selection
 		$this->perOptions = $this->getThePerSelections();
 		if ($this->perOptions)
 		{
-			// [9230] Per Filter
+			// [9397] 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)
 			{
-				// [9239] Per Batch Selection
+				// [9406] 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()
 	{
-		// [9102] Get a db connection.
+		// [9269] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [9104] Create a new query object.
+		// [9271] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [9106] Select the text.
+		// [9273] Select the text.
 		$query->select($db->quoteName('department'));
 		$query->from($db->quoteName('#__costbenefitprojection_company'));
 		$query->order($db->quoteName('department') . ' ASC');
 
-		// [9110] Reset the query using our newly populated query object.
+		// [9277] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
 		$results = $db->loadColumn();
 
 		if ($results)
 		{
-			// [9118] get model
+			// [9285] get model
 			$model = $this->getModel();
 			$results = array_unique($results);
 			$filter = array();
 			foreach ($results as $department)
 			{
-				// [9129] Translate the department selection
+				// [9296] Translate the department selection
 				$text = $model->selectionTranslation($department,'department');
-				// [9131] Now add the department and its text to the options array
+				// [9298] 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()
 	{
-		// [9102] Get a db connection.
+		// [9269] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [9104] Create a new query object.
+		// [9271] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [9106] Select the text.
+		// [9273] Select the text.
 		$query->select($db->quoteName('per'));
 		$query->from($db->quoteName('#__costbenefitprojection_company'));
 		$query->order($db->quoteName('per') . ' ASC');
 
-		// [9110] Reset the query using our newly populated query object.
+		// [9277] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
 		$results = $db->loadColumn();
 
 		if ($results)
 		{
-			// [9118] get model
+			// [9285] get model
 			$model = $this->getModel();
 			$results = array_unique($results);
 			$filter = array();
 			foreach ($results as $per)
 			{
-				// [9129] Translate the per selection
+				// [9296] Translate the per selection
 				$text = $model->selectionTranslation($per,'per');
-				// [9131] Now add the per and its text to the options array
+				// [9298] 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 ac51d066..e3d758d4 100644
--- a/admin/views/company/submitbutton.js
+++ b/admin/views/company/submitbutton.js
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		submitbutton.js
diff --git a/admin/views/company/tmpl/edit.php b/admin/views/company/tmpl/edit.php
index 86c76037..3a6caee6 100644
--- a/admin/views/company/tmpl/edit.php
+++ b/admin/views/company/tmpl/edit.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		edit.php
@@ -135,33 +135,33 @@ $componentParams = JComponentHelper::getParams('com_costbenefitprojection');
 
 <script type="text/javascript">
 
-// #jform_department listeners for department_FemBBLx function
+// #jform_department listeners for department_bETABWB function
 jQuery('#jform_department').on('keyup',function()
 {
-	var department_FemBBLx = jQuery("#jform_department input[type='radio']:checked").val();
-	FemBBLx(department_FemBBLx);
+	var department_bETABWB = jQuery("#jform_department input[type='radio']:checked").val();
+	bETABWB(department_bETABWB);
 
 });
 jQuery('#adminForm').on('change', '#jform_department',function (e)
 {
 	e.preventDefault();
-	var department_FemBBLx = jQuery("#jform_department input[type='radio']:checked").val();
-	FemBBLx(department_FemBBLx);
+	var department_bETABWB = jQuery("#jform_department input[type='radio']:checked").val();
+	bETABWB(department_bETABWB);
 
 });
 
-// #jform_department listeners for department_kUrQZMs function
+// #jform_department listeners for department_RkgSPam function
 jQuery('#jform_department').on('keyup',function()
 {
-	var department_kUrQZMs = jQuery("#jform_department input[type='radio']:checked").val();
-	kUrQZMs(department_kUrQZMs);
+	var department_RkgSPam = jQuery("#jform_department input[type='radio']:checked").val();
+	RkgSPam(department_RkgSPam);
 
 });
 jQuery('#adminForm').on('change', '#jform_department',function (e)
 {
 	e.preventDefault();
-	var department_kUrQZMs = jQuery("#jform_department input[type='radio']:checked").val();
-	kUrQZMs(department_kUrQZMs);
+	var department_RkgSPam = jQuery("#jform_department input[type='radio']:checked").val();
+	RkgSPam(department_RkgSPam);
 
 });
 
diff --git a/admin/views/company/view.html.php b/admin/views/company/view.html.php
index 5997e4b1..ab7dd4e2 100644
--- a/admin/views/company/view.html.php
+++ b/admin/views/company/view.html.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
@@ -64,11 +64,11 @@ class CostbenefitprojectionViewCompany extends JViewLegacy
                         $this->referral = '&ref='.(string)$this->ref;
                 }
 
-		// [6564] Get Linked view data
-		$this->bqlscaling_factors		= $this->get('Bqlscaling_factors');
+		// [6731] Get Linked view data
+		$this->rxjscaling_factors		= $this->get('Rxjscaling_factors');
 
-		// [6564] Get Linked view data
-		$this->ynainterventions		= $this->get('Ynainterventions');
+		// [6731] Get Linked view data
+		$this->wrkinterventions		= $this->get('Wrkinterventions');
 
 		// 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');
-		// [10354] Built the actions for new and existing records.
+		// [10525] Built the actions for new and existing records.
 		if ($this->refid || $this->ref)
 		{
 			if ($this->canDo->get('company.create') && $isNew)
 			{
-				// [10366] We can create the record.
+				// [10537] We can create the record.
 				JToolBarHelper::save('company.save', 'JTOOLBAR_SAVE');
 			}
 			elseif ($this->canDo->get('company.edit'))
 			{
-				// [10378] We can save the record.
+				// [10549] We can save the record.
 				JToolBarHelper::save('company.save', 'JTOOLBAR_SAVE');
 			}
 			if ($isNew)
 			{
-				// [10383] Do not creat but cancel.
+				// [10554] Do not creat but cancel.
 				JToolBarHelper::cancel('company.cancel', 'JTOOLBAR_CANCEL');
 			}
 			else
 			{
-				// [10388] We can close it.
+				// [10559] We can close it.
 				JToolBarHelper::cancel('company.cancel', 'JTOOLBAR_CLOSE');
 			}
 		}
@@ -120,7 +120,7 @@ class CostbenefitprojectionViewCompany extends JViewLegacy
 		{
 			if ($isNew)
 			{
-				// [10396] For new records, check the create permission.
+				// [10567] 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'))
 				{
-					// [10423] We can save the new record
+					// [10594] We can save the new record
 					JToolBarHelper::apply('company.apply', 'JTOOLBAR_APPLY');
 					JToolBarHelper::save('company.save', 'JTOOLBAR_SAVE');
-					// [10426] We can save this record, but check the create permission to see
-					// [10427] if we can return to make a new one.
+					// [10597] We can save this record, but check the create permission to see
+					// [10598] 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();
-		// [10463] set help url for this view if found
+		// [10634] 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"); 
 
-		// [6599] Add the CSS for Footable.
+		// [6766] Add the CSS for Footable.
 		$document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable/css/footable.core.min.css');
 
-		// [6601] Use the Metro Style
+		// [6768] Use the Metro Style
 		if (!isset($this->fooTableStyle) || 0 == $this->fooTableStyle)
 		{
 			$document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable/css/footable.metro.min.css');
 		}
-		// [6606] Use the Legacy Style.
+		// [6773] Use the Legacy Style.
 		elseif (isset($this->fooTableStyle) && 1 == $this->fooTableStyle)
 		{
 			$document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable/css/footable.standalone.min.css');
 		}
 
-		// [6611] Add the JavaScript for Footable
+		// [6778] 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 bd3502c1..498adb58 100644
--- a/admin/views/companyresults/tmpl/default.php
+++ b/admin/views/companyresults/tmpl/default.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default.php
diff --git a/admin/views/companyresults/tmpl/default_chart_cost.php b/admin/views/companyresults/tmpl/default_chart_cost.php
index 9699cf03..1ad5028f 100644
--- a/admin/views/companyresults/tmpl/default_chart_cost.php
+++ b/admin/views/companyresults/tmpl/default_chart_cost.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_cost.php
diff --git a/admin/views/companyresults/tmpl/default_chart_cost_percent.php b/admin/views/companyresults/tmpl/default_chart_cost_percent.php
index c6c38627..4492521d 100644
--- a/admin/views/companyresults/tmpl/default_chart_cost_percent.php
+++ b/admin/views/companyresults/tmpl/default_chart_cost_percent.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_cost_percent.php
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 4ed8e06c..fae2a4c2 100644
--- a/admin/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php
+++ b/admin/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_intervention_cost_benefit.php
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 02a74032..6593e348 100644
--- a/admin/views/companyresults/tmpl/default_chart_work_days_lost.php
+++ b/admin/views/companyresults/tmpl/default_chart_work_days_lost.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_work_days_lost.php
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 52160be9..5beb4703 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
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_work_days_lost_percent.php
diff --git a/admin/views/companyresults/tmpl/default_main.php b/admin/views/companyresults/tmpl/default_main.php
index dc12b3aa..26667c15 100644
--- a/admin/views/companyresults/tmpl/default_main.php
+++ b/admin/views/companyresults/tmpl/default_main.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_main.php
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 adeb42d5..7fb1ba3d 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
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_table_calculated_cost_in_detail.php
diff --git a/admin/views/companyresults/tmpl/default_table_cost_summary.php b/admin/views/companyresults/tmpl/default_table_cost_summary.php
index c83c0270..96366a0f 100644
--- a/admin/views/companyresults/tmpl/default_table_cost_summary.php
+++ b/admin/views/companyresults/tmpl/default_table_cost_summary.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_table_cost_summary.php
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 d413eaac..c611e0e6 100644
--- a/admin/views/companyresults/tmpl/default_table_intervention_net_benefit.php
+++ b/admin/views/companyresults/tmpl/default_table_intervention_net_benefit.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_table_intervention_net_benefit.php
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 812c5844..4ed352ea 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
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_table_work_days_lost_summary.php
diff --git a/admin/views/companyresults/tmpl/default_variables.php b/admin/views/companyresults/tmpl/default_variables.php
index 66061509..04029006 100644
--- a/admin/views/companyresults/tmpl/default_variables.php
+++ b/admin/views/companyresults/tmpl/default_variables.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_variables.php
diff --git a/admin/views/companyresults/view.html.php b/admin/views/companyresults/view.html.php
index fc8f6c43..a196f518 100644
--- a/admin/views/companyresults/view.html.php
+++ b/admin/views/companyresults/view.html.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
@@ -39,10 +39,10 @@ class CostbenefitprojectionViewCompanyresults extends JViewLegacy
 		$this->user	= JFactory::getUser();
                 // get global action permissions
 		$this->canDo	= CostbenefitprojectionHelper::getActions('companyresults');
-		// [3077] Initialise variables.
+		// [3158] Initialise variables.
 		$this->item	= $this->get('Item');
 
-		// [3112] Check for errors.
+		// [3193] Check for errors.
 		if (count($errors = $this->get('Errors')))
 		{
 			JError::raiseWarning(500, implode("\n", $errors));
@@ -67,14 +67,14 @@ class CostbenefitprojectionViewCompanyresults extends JViewLegacy
 			$this->table_tabs = false;
 		}
 
-		// [3136] We don't need toolbar in the modal window.
+		// [3217] We don't need toolbar in the modal window.
 		if ($this->getLayout() !== 'modal')
 		{
-			// [3139] add the tool bar
+			// [3220] add the tool bar
 			$this->addToolBar();
 		}
 
-		// [3142] set the document
+		// [3223] set the document
 		$this->setDocument();
 
 		parent::display($tpl);
@@ -122,7 +122,7 @@ class CostbenefitprojectionViewCompanyresults extends JViewLegacy
 	 */
 	protected function setDocument()
 	{
-		// [3392] load the meta description
+		// [3473] load the meta description
 		if (isset($this->item->metadesc) && $this->item->metadesc)
 		{
 			$this->document->setDescription($this->item->metadesc);
@@ -131,7 +131,7 @@ class CostbenefitprojectionViewCompanyresults extends JViewLegacy
 		{
 			$this->document->setDescription($this->params->get('menu-meta_description'));
 		}
-		// [3401] load the key words if set
+		// [3482] load the key words if set
 		if (isset($this->item->metakey) && $this->item->metakey)
 		{
 			$this->document->setMetadata('keywords', $this->item->metakey);
@@ -140,7 +140,7 @@ class CostbenefitprojectionViewCompanyresults extends JViewLegacy
 		{
 			$this->document->setMetadata('keywords', $this->params->get('menu-meta_keywords'));
 		}
-		// [3410] check the robot params
+		// [3491] check the robot params
 		if (isset($this->item->robots) && $this->item->robots)
 		{
 			$this->document->setMetadata('robots', $this->item->robots);
@@ -149,12 +149,12 @@ class CostbenefitprojectionViewCompanyresults extends JViewLegacy
 		{
 			$this->document->setMetadata('robots', $this->params->get('robots'));
 		}
-		// [3419] check if autor is to be set
+		// [3500] 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);
 		}
-		// [3424] check if metadata is available
+		// [3505] check if metadata is available
 		if (isset($this->item->metadata) && $this->item->metadata)
 		{
 			$mdata = json_decode($this->item->metadata,true);
@@ -167,80 +167,80 @@ class CostbenefitprojectionViewCompanyresults extends JViewLegacy
 			}
 		} 
 
-		// [3485] always make sure jquery is loaded.
+		// [3566] always make sure jquery is loaded.
 		JHtml::_('jquery.framework');
-		// [3487] Load the header checker class.
+		// [3568] Load the header checker class.
 		require_once( JPATH_COMPONENT_SITE.'/helpers/headercheck.php' );
-		// [3489] Initialize the header checker.
+		// [3570] Initialize the header checker.
 		$HeaderCheck = new HeaderCheck;
 
-		// [3494] Load uikit options.
+		// [3575] Load uikit options.
 		$uikit = $this->params->get('uikit_load');
-		// [3496] Set script size.
+		// [3577] Set script size.
 		$size = $this->params->get('uikit_min');
-		// [3498] Set css style.
+		// [3579] Set css style.
 		$style = $this->params->get('uikit_style');
 
-		// [3501] The uikit css.
+		// [3582] 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');
 		}
-		// [3506] The uikit js.
+		// [3587] 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');
 		}
 
-		// [3571] Load the needed uikit components in this view.
+		// [3652] Load the needed uikit components in this view.
 		$uikitComp = $this->get('UikitComp');
 		if ($uikit != 2 && isset($uikitComp) && CostbenefitprojectionHelper::checkArray($uikitComp))
 		{
-			// [3575] load just in case.
+			// [3656] load just in case.
 			jimport('joomla.filesystem.file');
-			// [3577] loading...
+			// [3658] loading...
 			foreach ($uikitComp as $class)
 			{
 				foreach (CostbenefitprojectionHelper::$uk_components[$class] as $name)
 				{
-					// [3582] check if the CSS file exists.
+					// [3663] check if the CSS file exists.
 					if (JFile::exists(JPATH_ROOT.'/media/com_costbenefitprojection/uikit/css/components/'.$name.$style.$size.'.css'))
 					{
-						// [3585] load the css.
+						// [3666] load the css.
 						$this->document->addStyleSheet(JURI::root(true) .'/media/com_costbenefitprojection/uikit/css/components/'.$name.$style.$size.'.css');
 					}
-					// [3588] check if the JavaScript file exists.
+					// [3669] check if the JavaScript file exists.
 					if (JFile::exists(JPATH_ROOT.'/media/com_costbenefitprojection/uikit/js/components/'.$name.$size.'.js'))
 					{
-						// [3591] load the js.
+						// [3672] load the js.
 						$this->document->addScript(JURI::root(true) .'/media/com_costbenefitprojection/uikit/js/components/'.$name.$size.'.js');
 					}
 				}
 			}
 		} 
 
-		// [3467] add the google chart builder class.
+		// [3548] add the google chart builder class.
 		require_once JPATH_COMPONENT_ADMINISTRATOR.'/helpers/chartbuilder.php';
-		// [3469] load the google chart js.
+		// [3550] 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'); 
 
-		// [6599] Add the CSS for Footable.
+		// [6766] Add the CSS for Footable.
 		$this->document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable/css/footable.core.min.css');
 
-		// [6601] Use the Metro Style
+		// [6768] 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');
 		}
-		// [6606] Use the Legacy Style.
+		// [6773] 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');
 		}
 
-		// [6611] Add the JavaScript for Footable
+		// [6778] 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');
@@ -298,12 +298,12 @@ class CostbenefitprojectionViewCompanyresults extends JViewLegacy
 		JToolBarHelper::custom('companyresults.dashboard', 'grid-2', '', 'COM_COSTBENEFITPROJECTION_DASH', false);
 		if ($this->canDo->get('companyresults.companies'))
 		{
-			// [3266] add Companies button.
+			// [3347] add Companies button.
 			JToolBarHelper::custom('companyresults.gotoCompanies', 'vcard', '', 'COM_COSTBENEFITPROJECTION_COMPANIES', false);
 		}
 		if ($this->canDo->get('companyresults.edit'))
 		{
-			// [3266] add Edit button.
+			// [3347] 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 32101d7e..0df4b7e1 100644
--- a/admin/views/costbenefitprojection/tmpl/default.php
+++ b/admin/views/costbenefitprojection/tmpl/default.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default.php
diff --git a/admin/views/costbenefitprojection/tmpl/default_main.php b/admin/views/costbenefitprojection/tmpl/default_main.php
index ae9fcd97..e428ca4b 100644
--- a/admin/views/costbenefitprojection/tmpl/default_main.php
+++ b/admin/views/costbenefitprojection/tmpl/default_main.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_main.php
diff --git a/admin/views/costbenefitprojection/tmpl/default_vdm.php b/admin/views/costbenefitprojection/tmpl/default_vdm.php
index c51913eb..022068ad 100644
--- a/admin/views/costbenefitprojection/tmpl/default_vdm.php
+++ b/admin/views/costbenefitprojection/tmpl/default_vdm.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_vdm.php
diff --git a/admin/views/costbenefitprojection/view.html.php b/admin/views/costbenefitprojection/view.html.php
index d3f79a20..d40533a2 100644
--- a/admin/views/costbenefitprojection/view.html.php
+++ b/admin/views/costbenefitprojection/view.html.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
diff --git a/admin/views/countries/tmpl/default.php b/admin/views/countries/tmpl/default.php
index 4c8f27e1..be7b8066 100644
--- a/admin/views/countries/tmpl/default.php
+++ b/admin/views/countries/tmpl/default.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default.php
diff --git a/admin/views/countries/tmpl/default_batch_body.php b/admin/views/countries/tmpl/default_batch_body.php
index 69bf149f..f7b4d1b6 100644
--- a/admin/views/countries/tmpl/default_batch_body.php
+++ b/admin/views/countries/tmpl/default_batch_body.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_batch_body.php
diff --git a/admin/views/countries/tmpl/default_batch_footer.php b/admin/views/countries/tmpl/default_batch_footer.php
index b6c7c7c1..90c179ea 100644
--- a/admin/views/countries/tmpl/default_batch_footer.php
+++ b/admin/views/countries/tmpl/default_batch_footer.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_batch_footer.php
diff --git a/admin/views/countries/tmpl/default_body.php b/admin/views/countries/tmpl/default_body.php
index ce2427c3..f73adfe6 100644
--- a/admin/views/countries/tmpl/default_body.php
+++ b/admin/views/countries/tmpl/default_body.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_body.php
diff --git a/admin/views/countries/tmpl/default_foot.php b/admin/views/countries/tmpl/default_foot.php
index 8d0c624a..98b7c6ce 100644
--- a/admin/views/countries/tmpl/default_foot.php
+++ b/admin/views/countries/tmpl/default_foot.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_foot.php
diff --git a/admin/views/countries/tmpl/default_head.php b/admin/views/countries/tmpl/default_head.php
index 23cbeb5b..efe76064 100644
--- a/admin/views/countries/tmpl/default_head.php
+++ b/admin/views/countries/tmpl/default_head.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_head.php
diff --git a/admin/views/countries/tmpl/default_toolbar.php b/admin/views/countries/tmpl/default_toolbar.php
index 6c8a8b5d..c54632ed 100644
--- a/admin/views/countries/tmpl/default_toolbar.php
+++ b/admin/views/countries/tmpl/default_toolbar.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_toolbar.php
diff --git a/admin/views/countries/view.html.php b/admin/views/countries/view.html.php
index 781f6c65..1038e65b 100644
--- a/admin/views/countries/view.html.php
+++ b/admin/views/countries/view.html.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
@@ -196,11 +196,11 @@ class CostbenefitprojectionViewCountries extends JViewLegacy
 			);
                 }  
 
-		// [9192] Set Currency Name Selection
+		// [9359] Set Currency Name Selection
 		$this->currencyNameOptions = JFormHelper::loadFieldType('Currency')->getOptions();
 		if ($this->currencyNameOptions)
 		{
-			// [9196] Currency Name Filter
+			// [9363] 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)
 			{
-				// [9205] Currency Name Batch Selection
+				// [9372] 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 3e9fafc6..bcd1509c 100644
--- a/admin/views/country/submitbutton.js
+++ b/admin/views/country/submitbutton.js
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		submitbutton.js
diff --git a/admin/views/country/tmpl/edit.php b/admin/views/country/tmpl/edit.php
index 669e90da..26df1320 100644
--- a/admin/views/country/tmpl/edit.php
+++ b/admin/views/country/tmpl/edit.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		edit.php
diff --git a/admin/views/country/view.html.php b/admin/views/country/view.html.php
index 91fbd849..6033924e 100644
--- a/admin/views/country/view.html.php
+++ b/admin/views/country/view.html.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
@@ -64,11 +64,11 @@ class CostbenefitprojectionViewCountry extends JViewLegacy
                         $this->referral = '&ref='.(string)$this->ref;
                 }
 
-		// [6564] Get Linked view data
-		$this->xrcservice_providers		= $this->get('Xrcservice_providers');
+		// [6731] Get Linked view data
+		$this->zrcservice_providers		= $this->get('Zrcservice_providers');
 
-		// [6564] Get Linked view data
-		$this->tnpcompanies		= $this->get('Tnpcompanies');
+		// [6731] Get Linked view data
+		$this->myzcompanies		= $this->get('Myzcompanies');
 
 		// 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');
-		// [10354] Built the actions for new and existing records.
+		// [10525] Built the actions for new and existing records.
 		if ($this->refid || $this->ref)
 		{
 			if ($this->canDo->get('country.create') && $isNew)
 			{
-				// [10366] We can create the record.
+				// [10537] We can create the record.
 				JToolBarHelper::save('country.save', 'JTOOLBAR_SAVE');
 			}
 			elseif ($this->canDo->get('country.edit'))
 			{
-				// [10378] We can save the record.
+				// [10549] We can save the record.
 				JToolBarHelper::save('country.save', 'JTOOLBAR_SAVE');
 			}
 			if ($isNew)
 			{
-				// [10383] Do not creat but cancel.
+				// [10554] Do not creat but cancel.
 				JToolBarHelper::cancel('country.cancel', 'JTOOLBAR_CANCEL');
 			}
 			else
 			{
-				// [10388] We can close it.
+				// [10559] We can close it.
 				JToolBarHelper::cancel('country.cancel', 'JTOOLBAR_CLOSE');
 			}
 		}
@@ -120,7 +120,7 @@ class CostbenefitprojectionViewCountry extends JViewLegacy
 		{
 			if ($isNew)
 			{
-				// [10396] For new records, check the create permission.
+				// [10567] 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'))
 				{
-					// [10423] We can save the new record
+					// [10594] We can save the new record
 					JToolBarHelper::apply('country.apply', 'JTOOLBAR_APPLY');
 					JToolBarHelper::save('country.save', 'JTOOLBAR_SAVE');
-					// [10426] We can save this record, but check the create permission to see
-					// [10427] if we can return to make a new one.
+					// [10597] We can save this record, but check the create permission to see
+					// [10598] 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();
-		// [10463] set help url for this view if found
+		// [10634] 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"); 
 
-		// [6599] Add the CSS for Footable.
+		// [6766] Add the CSS for Footable.
 		$document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable/css/footable.core.min.css');
 
-		// [6601] Use the Metro Style
+		// [6768] Use the Metro Style
 		if (!isset($this->fooTableStyle) || 0 == $this->fooTableStyle)
 		{
 			$document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable/css/footable.metro.min.css');
 		}
-		// [6606] Use the Legacy Style.
+		// [6773] Use the Legacy Style.
 		elseif (isset($this->fooTableStyle) && 1 == $this->fooTableStyle)
 		{
 			$document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable/css/footable.standalone.min.css');
 		}
 
-		// [6611] Add the JavaScript for Footable
+		// [6778] 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 676f46e5..e089b449 100644
--- a/admin/views/currencies/tmpl/default.php
+++ b/admin/views/currencies/tmpl/default.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default.php
diff --git a/admin/views/currencies/tmpl/default_batch_body.php b/admin/views/currencies/tmpl/default_batch_body.php
index c29b4b0d..b2316a93 100644
--- a/admin/views/currencies/tmpl/default_batch_body.php
+++ b/admin/views/currencies/tmpl/default_batch_body.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_batch_body.php
diff --git a/admin/views/currencies/tmpl/default_batch_footer.php b/admin/views/currencies/tmpl/default_batch_footer.php
index 1926715b..c44f707b 100644
--- a/admin/views/currencies/tmpl/default_batch_footer.php
+++ b/admin/views/currencies/tmpl/default_batch_footer.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_batch_footer.php
diff --git a/admin/views/currencies/tmpl/default_body.php b/admin/views/currencies/tmpl/default_body.php
index f97294b0..49b42bd0 100644
--- a/admin/views/currencies/tmpl/default_body.php
+++ b/admin/views/currencies/tmpl/default_body.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_body.php
diff --git a/admin/views/currencies/tmpl/default_foot.php b/admin/views/currencies/tmpl/default_foot.php
index fd47be6a..12dd9a31 100644
--- a/admin/views/currencies/tmpl/default_foot.php
+++ b/admin/views/currencies/tmpl/default_foot.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_foot.php
diff --git a/admin/views/currencies/tmpl/default_head.php b/admin/views/currencies/tmpl/default_head.php
index 4e28494b..6e5d4779 100644
--- a/admin/views/currencies/tmpl/default_head.php
+++ b/admin/views/currencies/tmpl/default_head.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_head.php
diff --git a/admin/views/currencies/tmpl/default_toolbar.php b/admin/views/currencies/tmpl/default_toolbar.php
index a4fb96f3..5cec4529 100644
--- a/admin/views/currencies/tmpl/default_toolbar.php
+++ b/admin/views/currencies/tmpl/default_toolbar.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_toolbar.php
diff --git a/admin/views/currencies/view.html.php b/admin/views/currencies/view.html.php
index 9a94cb42..a99796d0 100644
--- a/admin/views/currencies/view.html.php
+++ b/admin/views/currencies/view.html.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
diff --git a/admin/views/currency/submitbutton.js b/admin/views/currency/submitbutton.js
index 5f3613e0..1afc29a6 100644
--- a/admin/views/currency/submitbutton.js
+++ b/admin/views/currency/submitbutton.js
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		submitbutton.js
diff --git a/admin/views/currency/tmpl/edit.php b/admin/views/currency/tmpl/edit.php
index 9a764426..3b1088c9 100644
--- a/admin/views/currency/tmpl/edit.php
+++ b/admin/views/currency/tmpl/edit.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		edit.php
diff --git a/admin/views/currency/view.html.php b/admin/views/currency/view.html.php
index d74e58c7..8824f2aa 100644
--- a/admin/views/currency/view.html.php
+++ b/admin/views/currency/view.html.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
@@ -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');
-		// [10354] Built the actions for new and existing records.
+		// [10525] Built the actions for new and existing records.
 		if ($this->refid || $this->ref)
 		{
 			if ($this->canDo->get('currency.create') && $isNew)
 			{
-				// [10366] We can create the record.
+				// [10537] We can create the record.
 				JToolBarHelper::save('currency.save', 'JTOOLBAR_SAVE');
 			}
 			elseif ($this->canDo->get('currency.edit'))
 			{
-				// [10378] We can save the record.
+				// [10549] We can save the record.
 				JToolBarHelper::save('currency.save', 'JTOOLBAR_SAVE');
 			}
 			if ($isNew)
 			{
-				// [10383] Do not creat but cancel.
+				// [10554] Do not creat but cancel.
 				JToolBarHelper::cancel('currency.cancel', 'JTOOLBAR_CANCEL');
 			}
 			else
 			{
-				// [10388] We can close it.
+				// [10559] We can close it.
 				JToolBarHelper::cancel('currency.cancel', 'JTOOLBAR_CLOSE');
 			}
 		}
@@ -114,7 +114,7 @@ class CostbenefitprojectionViewCurrency extends JViewLegacy
 		{
 			if ($isNew)
 			{
-				// [10396] For new records, check the create permission.
+				// [10567] 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'))
 				{
-					// [10423] We can save the new record
+					// [10594] We can save the new record
 					JToolBarHelper::apply('currency.apply', 'JTOOLBAR_APPLY');
 					JToolBarHelper::save('currency.save', 'JTOOLBAR_SAVE');
-					// [10426] We can save this record, but check the create permission to see
-					// [10427] if we can return to make a new one.
+					// [10597] We can save this record, but check the create permission to see
+					// [10598] 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();
-		// [10463] set help url for this view if found
+		// [10634] 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 8fc5dfd9..1d48d28b 100644
--- a/admin/views/health_data/submitbutton.js
+++ b/admin/views/health_data/submitbutton.js
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		submitbutton.js
diff --git a/admin/views/health_data/tmpl/edit.php b/admin/views/health_data/tmpl/edit.php
index 75f8a09b..38fe7344 100644
--- a/admin/views/health_data/tmpl/edit.php
+++ b/admin/views/health_data/tmpl/edit.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		edit.php
diff --git a/admin/views/health_data/view.html.php b/admin/views/health_data/view.html.php
index 79c1beee..942b6bb9 100644
--- a/admin/views/health_data/view.html.php
+++ b/admin/views/health_data/view.html.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
@@ -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');
-		// [10354] Built the actions for new and existing records.
+		// [10525] Built the actions for new and existing records.
 		if ($this->refid || $this->ref)
 		{
 			if ($this->canDo->get('health_data.create') && $isNew)
 			{
-				// [10366] We can create the record.
+				// [10537] We can create the record.
 				JToolBarHelper::save('health_data.save', 'JTOOLBAR_SAVE');
 			}
 			elseif ($this->canDo->get('health_data.edit'))
 			{
-				// [10378] We can save the record.
+				// [10549] We can save the record.
 				JToolBarHelper::save('health_data.save', 'JTOOLBAR_SAVE');
 			}
 			if ($isNew)
 			{
-				// [10383] Do not creat but cancel.
+				// [10554] Do not creat but cancel.
 				JToolBarHelper::cancel('health_data.cancel', 'JTOOLBAR_CANCEL');
 			}
 			else
 			{
-				// [10388] We can close it.
+				// [10559] We can close it.
 				JToolBarHelper::cancel('health_data.cancel', 'JTOOLBAR_CLOSE');
 			}
 		}
@@ -114,7 +114,7 @@ class CostbenefitprojectionViewHealth_data extends JViewLegacy
 		{
 			if ($isNew)
 			{
-				// [10396] For new records, check the create permission.
+				// [10567] 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'))
 				{
-					// [10423] We can save the new record
+					// [10594] We can save the new record
 					JToolBarHelper::apply('health_data.apply', 'JTOOLBAR_APPLY');
 					JToolBarHelper::save('health_data.save', 'JTOOLBAR_SAVE');
-					// [10426] We can save this record, but check the create permission to see
-					// [10427] if we can return to make a new one.
+					// [10597] We can save this record, but check the create permission to see
+					// [10598] 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();
-		// [10463] set help url for this view if found
+		// [10634] 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 88f9505e..850e3185 100644
--- a/admin/views/health_data_sets/tmpl/default.php
+++ b/admin/views/health_data_sets/tmpl/default.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default.php
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 8daf221a..47f0c0ab 100644
--- a/admin/views/health_data_sets/tmpl/default_batch_body.php
+++ b/admin/views/health_data_sets/tmpl/default_batch_body.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_batch_body.php
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 e00ed1aa..9c58cb4c 100644
--- a/admin/views/health_data_sets/tmpl/default_batch_footer.php
+++ b/admin/views/health_data_sets/tmpl/default_batch_footer.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_batch_footer.php
diff --git a/admin/views/health_data_sets/tmpl/default_body.php b/admin/views/health_data_sets/tmpl/default_body.php
index cbe8f060..9b4d74f4 100644
--- a/admin/views/health_data_sets/tmpl/default_body.php
+++ b/admin/views/health_data_sets/tmpl/default_body.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_body.php
diff --git a/admin/views/health_data_sets/tmpl/default_foot.php b/admin/views/health_data_sets/tmpl/default_foot.php
index 6130b7c3..f2b36a95 100644
--- a/admin/views/health_data_sets/tmpl/default_foot.php
+++ b/admin/views/health_data_sets/tmpl/default_foot.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_foot.php
diff --git a/admin/views/health_data_sets/tmpl/default_head.php b/admin/views/health_data_sets/tmpl/default_head.php
index 8cd09840..e3c98ae3 100644
--- a/admin/views/health_data_sets/tmpl/default_head.php
+++ b/admin/views/health_data_sets/tmpl/default_head.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_head.php
diff --git a/admin/views/health_data_sets/tmpl/default_toolbar.php b/admin/views/health_data_sets/tmpl/default_toolbar.php
index eb890eda..3fdb111c 100644
--- a/admin/views/health_data_sets/tmpl/default_toolbar.php
+++ b/admin/views/health_data_sets/tmpl/default_toolbar.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_toolbar.php
diff --git a/admin/views/health_data_sets/view.html.php b/admin/views/health_data_sets/view.html.php
index 3fd49290..32a4e1c2 100644
--- a/admin/views/health_data_sets/view.html.php
+++ b/admin/views/health_data_sets/view.html.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
@@ -196,11 +196,11 @@ class CostbenefitprojectionViewHealth_data_sets extends JViewLegacy
 			);
                 }  
 
-		// [9192] Set Causerisk Name Selection
+		// [9359] Set Causerisk Name Selection
 		$this->causeriskNameOptions = JFormHelper::loadFieldType('Causesrisks')->getOptions();
 		if ($this->causeriskNameOptions)
 		{
-			// [9196] Causerisk Name Filter
+			// [9363] 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)
 			{
-				// [9205] Causerisk Name Batch Selection
+				// [9372] 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
 			}
 		}
 
-		// [9226] Set Year Selection
+		// [9393] Set Year Selection
 		$this->yearOptions = $this->getTheYearSelections();
 		if ($this->yearOptions)
 		{
-			// [9230] Year Filter
+			// [9397] 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)
 			{
-				// [9239] Year Batch Selection
+				// [9406] 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
 			}
 		}
 
-		// [9192] Set Country Name Selection
+		// [9359] Set Country Name Selection
 		$this->countryNameOptions = JFormHelper::loadFieldType('Countries')->getOptions();
 		if ($this->countryNameOptions)
 		{
-			// [9196] Country Name Filter
+			// [9363] 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)
 			{
-				// [9205] Country Name Batch Selection
+				// [9372] 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()
 	{
-		// [9102] Get a db connection.
+		// [9269] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [9104] Create a new query object.
+		// [9271] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [9106] Select the text.
+		// [9273] Select the text.
 		$query->select($db->quoteName('year'));
 		$query->from($db->quoteName('#__costbenefitprojection_health_data'));
 		$query->order($db->quoteName('year') . ' ASC');
 
-		// [9110] Reset the query using our newly populated query object.
+		// [9277] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
 		$results = $db->loadColumn();
 
 		if ($results)
 		{
-			// [9118] get model
+			// [9285] get model
 			$model = $this->getModel();
 			$results = array_unique($results);
 			$filter = array();
 			foreach ($results as $year)
 			{
-				// [9129] Translate the year selection
+				// [9296] Translate the year selection
 				$text = $model->selectionTranslation($year,'year');
-				// [9131] Now add the year and its text to the options array
+				// [9298] 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 b1075c0e..a6ea3fb4 100644
--- a/admin/views/help_document/submitbutton.js
+++ b/admin/views/help_document/submitbutton.js
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		submitbutton.js
diff --git a/admin/views/help_document/tmpl/edit.php b/admin/views/help_document/tmpl/edit.php
index 905b0fd0..e6755d62 100644
--- a/admin/views/help_document/tmpl/edit.php
+++ b/admin/views/help_document/tmpl/edit.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		edit.php
@@ -94,93 +94,93 @@ $componentParams = JComponentHelper::getParams('com_costbenefitprojection');
 
 <script type="text/javascript">
 
-// #jform_location listeners for location_cxQpFiW function
+// #jform_location listeners for location_rjBFAdG function
 jQuery('#jform_location').on('keyup',function()
 {
-	var location_cxQpFiW = jQuery("#jform_location input[type='radio']:checked").val();
-	cxQpFiW(location_cxQpFiW);
+	var location_rjBFAdG = jQuery("#jform_location input[type='radio']:checked").val();
+	rjBFAdG(location_rjBFAdG);
 
 });
 jQuery('#adminForm').on('change', '#jform_location',function (e)
 {
 	e.preventDefault();
-	var location_cxQpFiW = jQuery("#jform_location input[type='radio']:checked").val();
-	cxQpFiW(location_cxQpFiW);
+	var location_rjBFAdG = jQuery("#jform_location input[type='radio']:checked").val();
+	rjBFAdG(location_rjBFAdG);
 
 });
 
-// #jform_location listeners for location_uMNxJWJ function
+// #jform_location listeners for location_tedcpcc function
 jQuery('#jform_location').on('keyup',function()
 {
-	var location_uMNxJWJ = jQuery("#jform_location input[type='radio']:checked").val();
-	uMNxJWJ(location_uMNxJWJ);
+	var location_tedcpcc = jQuery("#jform_location input[type='radio']:checked").val();
+	tedcpcc(location_tedcpcc);
 
 });
 jQuery('#adminForm').on('change', '#jform_location',function (e)
 {
 	e.preventDefault();
-	var location_uMNxJWJ = jQuery("#jform_location input[type='radio']:checked").val();
-	uMNxJWJ(location_uMNxJWJ);
+	var location_tedcpcc = jQuery("#jform_location input[type='radio']:checked").val();
+	tedcpcc(location_tedcpcc);
 
 });
 
-// #jform_type listeners for type_NdVMDpm function
+// #jform_type listeners for type_dzQOnAt function
 jQuery('#jform_type').on('keyup',function()
 {
-	var type_NdVMDpm = jQuery("#jform_type").val();
-	NdVMDpm(type_NdVMDpm);
+	var type_dzQOnAt = jQuery("#jform_type").val();
+	dzQOnAt(type_dzQOnAt);
 
 });
 jQuery('#adminForm').on('change', '#jform_type',function (e)
 {
 	e.preventDefault();
-	var type_NdVMDpm = jQuery("#jform_type").val();
-	NdVMDpm(type_NdVMDpm);
+	var type_dzQOnAt = jQuery("#jform_type").val();
+	dzQOnAt(type_dzQOnAt);
 
 });
 
-// #jform_type listeners for type_XRJJvwV function
+// #jform_type listeners for type_HWQwlmm function
 jQuery('#jform_type').on('keyup',function()
 {
-	var type_XRJJvwV = jQuery("#jform_type").val();
-	XRJJvwV(type_XRJJvwV);
+	var type_HWQwlmm = jQuery("#jform_type").val();
+	HWQwlmm(type_HWQwlmm);
 
 });
 jQuery('#adminForm').on('change', '#jform_type',function (e)
 {
 	e.preventDefault();
-	var type_XRJJvwV = jQuery("#jform_type").val();
-	XRJJvwV(type_XRJJvwV);
+	var type_HWQwlmm = jQuery("#jform_type").val();
+	HWQwlmm(type_HWQwlmm);
 
 });
 
-// #jform_type listeners for type_VAWSUKA function
+// #jform_type listeners for type_fWSNxVS function
 jQuery('#jform_type').on('keyup',function()
 {
-	var type_VAWSUKA = jQuery("#jform_type").val();
-	VAWSUKA(type_VAWSUKA);
+	var type_fWSNxVS = jQuery("#jform_type").val();
+	fWSNxVS(type_fWSNxVS);
 
 });
 jQuery('#adminForm').on('change', '#jform_type',function (e)
 {
 	e.preventDefault();
-	var type_VAWSUKA = jQuery("#jform_type").val();
-	VAWSUKA(type_VAWSUKA);
+	var type_fWSNxVS = jQuery("#jform_type").val();
+	fWSNxVS(type_fWSNxVS);
 
 });
 
-// #jform_target listeners for target_VdAPKge function
+// #jform_target listeners for target_vpCnhLJ function
 jQuery('#jform_target').on('keyup',function()
 {
-	var target_VdAPKge = jQuery("#jform_target input[type='radio']:checked").val();
-	VdAPKge(target_VdAPKge);
+	var target_vpCnhLJ = jQuery("#jform_target input[type='radio']:checked").val();
+	vpCnhLJ(target_vpCnhLJ);
 
 });
 jQuery('#adminForm').on('change', '#jform_target',function (e)
 {
 	e.preventDefault();
-	var target_VdAPKge = jQuery("#jform_target input[type='radio']:checked").val();
-	VdAPKge(target_VdAPKge);
+	var target_vpCnhLJ = jQuery("#jform_target input[type='radio']:checked").val();
+	vpCnhLJ(target_vpCnhLJ);
 
 });
 
diff --git a/admin/views/help_document/view.html.php b/admin/views/help_document/view.html.php
index 552cb52d..fddcb669 100644
--- a/admin/views/help_document/view.html.php
+++ b/admin/views/help_document/view.html.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
@@ -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');
-		// [10354] Built the actions for new and existing records.
+		// [10525] Built the actions for new and existing records.
 		if ($this->refid || $this->ref)
 		{
 			if ($this->canDo->get('help_document.create') && $isNew)
 			{
-				// [10366] We can create the record.
+				// [10537] We can create the record.
 				JToolBarHelper::save('help_document.save', 'JTOOLBAR_SAVE');
 			}
 			elseif ($this->canDo->get('help_document.edit'))
 			{
-				// [10378] We can save the record.
+				// [10549] We can save the record.
 				JToolBarHelper::save('help_document.save', 'JTOOLBAR_SAVE');
 			}
 			if ($isNew)
 			{
-				// [10383] Do not creat but cancel.
+				// [10554] Do not creat but cancel.
 				JToolBarHelper::cancel('help_document.cancel', 'JTOOLBAR_CANCEL');
 			}
 			else
 			{
-				// [10388] We can close it.
+				// [10559] We can close it.
 				JToolBarHelper::cancel('help_document.cancel', 'JTOOLBAR_CLOSE');
 			}
 		}
@@ -114,7 +114,7 @@ class CostbenefitprojectionViewHelp_document extends JViewLegacy
 		{
 			if ($isNew)
 			{
-				// [10396] For new records, check the create permission.
+				// [10567] 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'))
 				{
-					// [10423] We can save the new record
+					// [10594] We can save the new record
 					JToolBarHelper::apply('help_document.apply', 'JTOOLBAR_APPLY');
 					JToolBarHelper::save('help_document.save', 'JTOOLBAR_SAVE');
-					// [10426] We can save this record, but check the create permission to see
-					// [10427] if we can return to make a new one.
+					// [10597] We can save this record, but check the create permission to see
+					// [10598] 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();
-		// [10463] set help url for this view if found
+		// [10634] 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 ee05055e..4c0cf9ca 100644
--- a/admin/views/help_documents/tmpl/default.php
+++ b/admin/views/help_documents/tmpl/default.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default.php
diff --git a/admin/views/help_documents/tmpl/default_batch_body.php b/admin/views/help_documents/tmpl/default_batch_body.php
index 7ec49de9..82fb13a8 100644
--- a/admin/views/help_documents/tmpl/default_batch_body.php
+++ b/admin/views/help_documents/tmpl/default_batch_body.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_batch_body.php
diff --git a/admin/views/help_documents/tmpl/default_batch_footer.php b/admin/views/help_documents/tmpl/default_batch_footer.php
index 722c7a3c..9e721a3d 100644
--- a/admin/views/help_documents/tmpl/default_batch_footer.php
+++ b/admin/views/help_documents/tmpl/default_batch_footer.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_batch_footer.php
diff --git a/admin/views/help_documents/tmpl/default_body.php b/admin/views/help_documents/tmpl/default_body.php
index d203bcb1..e4a90dfa 100644
--- a/admin/views/help_documents/tmpl/default_body.php
+++ b/admin/views/help_documents/tmpl/default_body.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_body.php
diff --git a/admin/views/help_documents/tmpl/default_foot.php b/admin/views/help_documents/tmpl/default_foot.php
index 8d0c624a..98b7c6ce 100644
--- a/admin/views/help_documents/tmpl/default_foot.php
+++ b/admin/views/help_documents/tmpl/default_foot.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_foot.php
diff --git a/admin/views/help_documents/tmpl/default_head.php b/admin/views/help_documents/tmpl/default_head.php
index 0e8894e1..16d85593 100644
--- a/admin/views/help_documents/tmpl/default_head.php
+++ b/admin/views/help_documents/tmpl/default_head.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_head.php
diff --git a/admin/views/help_documents/tmpl/default_toolbar.php b/admin/views/help_documents/tmpl/default_toolbar.php
index 6b0b3faf..2296a9f4 100644
--- a/admin/views/help_documents/tmpl/default_toolbar.php
+++ b/admin/views/help_documents/tmpl/default_toolbar.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_toolbar.php
diff --git a/admin/views/help_documents/view.html.php b/admin/views/help_documents/view.html.php
index 0a8413b6..6ee7c6e1 100644
--- a/admin/views/help_documents/view.html.php
+++ b/admin/views/help_documents/view.html.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
@@ -196,11 +196,11 @@ class CostbenefitprojectionViewHelp_documents extends JViewLegacy
 			);
                 }  
 
-		// [9226] Set Type Selection
+		// [9393] Set Type Selection
 		$this->typeOptions = $this->getTheTypeSelections();
 		if ($this->typeOptions)
 		{
-			// [9230] Type Filter
+			// [9397] 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)
 			{
-				// [9239] Type Batch Selection
+				// [9406] 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
 			}
 		}
 
-		// [9226] Set Location Selection
+		// [9393] Set Location Selection
 		$this->locationOptions = $this->getTheLocationSelections();
 		if ($this->locationOptions)
 		{
-			// [9230] Location Filter
+			// [9397] 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)
 			{
-				// [9239] Location Batch Selection
+				// [9406] 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
 			}
 		}
 
-		// [9226] Set Admin View Selection
+		// [9393] Set Admin View Selection
 		$this->admin_viewOptions = $this->getTheAdmin_viewSelections();
 		if ($this->admin_viewOptions)
 		{
-			// [9230] Admin View Filter
+			// [9397] 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)
 			{
-				// [9239] Admin View Batch Selection
+				// [9406] 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
 			}
 		}
 
-		// [9226] Set Site View Selection
+		// [9393] Set Site View Selection
 		$this->site_viewOptions = $this->getTheSite_viewSelections();
 		if ($this->site_viewOptions)
 		{
-			// [9230] Site View Filter
+			// [9397] 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)
 			{
-				// [9239] Site View Batch Selection
+				// [9406] 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()
 	{
-		// [9102] Get a db connection.
+		// [9269] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [9104] Create a new query object.
+		// [9271] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [9106] Select the text.
+		// [9273] Select the text.
 		$query->select($db->quoteName('type'));
 		$query->from($db->quoteName('#__costbenefitprojection_help_document'));
 		$query->order($db->quoteName('type') . ' ASC');
 
-		// [9110] Reset the query using our newly populated query object.
+		// [9277] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
 		$results = $db->loadColumn();
 
 		if ($results)
 		{
-			// [9118] get model
+			// [9285] get model
 			$model = $this->getModel();
 			$results = array_unique($results);
 			$filter = array();
 			foreach ($results as $type)
 			{
-				// [9129] Translate the type selection
+				// [9296] Translate the type selection
 				$text = $model->selectionTranslation($type,'type');
-				// [9131] Now add the type and its text to the options array
+				// [9298] 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()
 	{
-		// [9102] Get a db connection.
+		// [9269] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [9104] Create a new query object.
+		// [9271] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [9106] Select the text.
+		// [9273] Select the text.
 		$query->select($db->quoteName('location'));
 		$query->from($db->quoteName('#__costbenefitprojection_help_document'));
 		$query->order($db->quoteName('location') . ' ASC');
 
-		// [9110] Reset the query using our newly populated query object.
+		// [9277] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
 		$results = $db->loadColumn();
 
 		if ($results)
 		{
-			// [9118] get model
+			// [9285] get model
 			$model = $this->getModel();
 			$results = array_unique($results);
 			$filter = array();
 			foreach ($results as $location)
 			{
-				// [9129] Translate the location selection
+				// [9296] Translate the location selection
 				$text = $model->selectionTranslation($location,'location');
-				// [9131] Now add the location and its text to the options array
+				// [9298] 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()
 	{
-		// [9102] Get a db connection.
+		// [9269] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [9104] Create a new query object.
+		// [9271] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [9106] Select the text.
+		// [9273] Select the text.
 		$query->select($db->quoteName('admin_view'));
 		$query->from($db->quoteName('#__costbenefitprojection_help_document'));
 		$query->order($db->quoteName('admin_view') . ' ASC');
 
-		// [9110] Reset the query using our newly populated query object.
+		// [9277] 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)
 			{
-				// [9136] Now add the admin_view and its text to the options array
+				// [9303] 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()
 	{
-		// [9102] Get a db connection.
+		// [9269] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [9104] Create a new query object.
+		// [9271] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [9106] Select the text.
+		// [9273] Select the text.
 		$query->select($db->quoteName('site_view'));
 		$query->from($db->quoteName('#__costbenefitprojection_help_document'));
 		$query->order($db->quoteName('site_view') . ' ASC');
 
-		// [9110] Reset the query using our newly populated query object.
+		// [9277] 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)
 			{
-				// [9136] Now add the site_view and its text to the options array
+				// [9303] 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 a3e62d67..419a5a8e 100644
--- a/admin/views/import/tmpl/default.php
+++ b/admin/views/import/tmpl/default.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default.php
diff --git a/admin/views/import/view.html.php b/admin/views/import/view.html.php
index 29151fee..f6c14d4e 100644
--- a/admin/views/import/view.html.php
+++ b/admin/views/import/view.html.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
diff --git a/admin/views/intervention/submitbutton.js b/admin/views/intervention/submitbutton.js
index c812838a..28bc37e3 100644
--- a/admin/views/intervention/submitbutton.js
+++ b/admin/views/intervention/submitbutton.js
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		submitbutton.js
diff --git a/admin/views/intervention/tmpl/edit.php b/admin/views/intervention/tmpl/edit.php
index 99c8418a..22fc85e1 100644
--- a/admin/views/intervention/tmpl/edit.php
+++ b/admin/views/intervention/tmpl/edit.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		edit.php
@@ -101,33 +101,33 @@ $componentParams = JComponentHelper::getParams('com_costbenefitprojection');
 
 <script type="text/javascript">
 
-// #jform_type listeners for type_hhqVuoH function
+// #jform_type listeners for type_JxOMJHD function
 jQuery('#jform_type').on('keyup',function()
 {
-	var type_hhqVuoH = jQuery("#jform_type input[type='radio']:checked").val();
-	hhqVuoH(type_hhqVuoH);
+	var type_JxOMJHD = jQuery("#jform_type input[type='radio']:checked").val();
+	JxOMJHD(type_JxOMJHD);
 
 });
 jQuery('#adminForm').on('change', '#jform_type',function (e)
 {
 	e.preventDefault();
-	var type_hhqVuoH = jQuery("#jform_type input[type='radio']:checked").val();
-	hhqVuoH(type_hhqVuoH);
+	var type_JxOMJHD = jQuery("#jform_type input[type='radio']:checked").val();
+	JxOMJHD(type_JxOMJHD);
 
 });
 
-// #jform_type listeners for type_LZHLLUr function
+// #jform_type listeners for type_SnkLovW function
 jQuery('#jform_type').on('keyup',function()
 {
-	var type_LZHLLUr = jQuery("#jform_type input[type='radio']:checked").val();
-	LZHLLUr(type_LZHLLUr);
+	var type_SnkLovW = jQuery("#jform_type input[type='radio']:checked").val();
+	SnkLovW(type_SnkLovW);
 
 });
 jQuery('#adminForm').on('change', '#jform_type',function (e)
 {
 	e.preventDefault();
-	var type_LZHLLUr = jQuery("#jform_type input[type='radio']:checked").val();
-	LZHLLUr(type_LZHLLUr);
+	var type_SnkLovW = jQuery("#jform_type input[type='radio']:checked").val();
+	SnkLovW(type_SnkLovW);
 
 });
 
diff --git a/admin/views/intervention/view.html.php b/admin/views/intervention/view.html.php
index e4e0152c..ec835e0a 100644
--- a/admin/views/intervention/view.html.php
+++ b/admin/views/intervention/view.html.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
@@ -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');
-		// [10354] Built the actions for new and existing records.
+		// [10525] Built the actions for new and existing records.
 		if ($this->refid || $this->ref)
 		{
 			if ($this->canDo->get('intervention.create') && $isNew)
 			{
-				// [10366] We can create the record.
+				// [10537] We can create the record.
 				JToolBarHelper::save('intervention.save', 'JTOOLBAR_SAVE');
 			}
 			elseif ($this->canDo->get('intervention.edit'))
 			{
-				// [10378] We can save the record.
+				// [10549] We can save the record.
 				JToolBarHelper::save('intervention.save', 'JTOOLBAR_SAVE');
 			}
 			if ($isNew)
 			{
-				// [10383] Do not creat but cancel.
+				// [10554] Do not creat but cancel.
 				JToolBarHelper::cancel('intervention.cancel', 'JTOOLBAR_CANCEL');
 			}
 			else
 			{
-				// [10388] We can close it.
+				// [10559] We can close it.
 				JToolBarHelper::cancel('intervention.cancel', 'JTOOLBAR_CLOSE');
 			}
 		}
@@ -114,7 +114,7 @@ class CostbenefitprojectionViewIntervention extends JViewLegacy
 		{
 			if ($isNew)
 			{
-				// [10396] For new records, check the create permission.
+				// [10567] 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'))
 				{
-					// [10423] We can save the new record
+					// [10594] We can save the new record
 					JToolBarHelper::apply('intervention.apply', 'JTOOLBAR_APPLY');
 					JToolBarHelper::save('intervention.save', 'JTOOLBAR_SAVE');
-					// [10426] We can save this record, but check the create permission to see
-					// [10427] if we can return to make a new one.
+					// [10597] We can save this record, but check the create permission to see
+					// [10598] 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();
-		// [10463] set help url for this view if found
+		// [10634] 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");
-		// [8884] Add Ajax Token
+		// [9051] 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 020b0a74..72a52f57 100644
--- a/admin/views/interventions/tmpl/default.php
+++ b/admin/views/interventions/tmpl/default.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default.php
diff --git a/admin/views/interventions/tmpl/default_batch_body.php b/admin/views/interventions/tmpl/default_batch_body.php
index 6446fde5..36b2418c 100644
--- a/admin/views/interventions/tmpl/default_batch_body.php
+++ b/admin/views/interventions/tmpl/default_batch_body.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_batch_body.php
diff --git a/admin/views/interventions/tmpl/default_batch_footer.php b/admin/views/interventions/tmpl/default_batch_footer.php
index bcb58fd0..57c71f76 100644
--- a/admin/views/interventions/tmpl/default_batch_footer.php
+++ b/admin/views/interventions/tmpl/default_batch_footer.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_batch_footer.php
diff --git a/admin/views/interventions/tmpl/default_body.php b/admin/views/interventions/tmpl/default_body.php
index daecb6a1..510c5e0e 100644
--- a/admin/views/interventions/tmpl/default_body.php
+++ b/admin/views/interventions/tmpl/default_body.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_body.php
diff --git a/admin/views/interventions/tmpl/default_foot.php b/admin/views/interventions/tmpl/default_foot.php
index 8d0c624a..98b7c6ce 100644
--- a/admin/views/interventions/tmpl/default_foot.php
+++ b/admin/views/interventions/tmpl/default_foot.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_foot.php
diff --git a/admin/views/interventions/tmpl/default_head.php b/admin/views/interventions/tmpl/default_head.php
index 8a7f26eb..a24f52f5 100644
--- a/admin/views/interventions/tmpl/default_head.php
+++ b/admin/views/interventions/tmpl/default_head.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_head.php
diff --git a/admin/views/interventions/tmpl/default_toolbar.php b/admin/views/interventions/tmpl/default_toolbar.php
index 4f4f5f4f..66297c8e 100644
--- a/admin/views/interventions/tmpl/default_toolbar.php
+++ b/admin/views/interventions/tmpl/default_toolbar.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_toolbar.php
diff --git a/admin/views/interventions/view.html.php b/admin/views/interventions/view.html.php
index 614929a2..7fcdf429 100644
--- a/admin/views/interventions/view.html.php
+++ b/admin/views/interventions/view.html.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
@@ -196,11 +196,11 @@ class CostbenefitprojectionViewInterventions extends JViewLegacy
 			);
                 }  
 
-		// [9192] Set Company Name Selection
+		// [9359] Set Company Name Selection
 		$this->companyNameOptions = JFormHelper::loadFieldType('Company')->getOptions();
 		if ($this->companyNameOptions)
 		{
-			// [9196] Company Name Filter
+			// [9363] 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)
 			{
-				// [9205] Company Name Batch Selection
+				// [9372] Company Name Batch Selection
 				JHtmlBatch_::addListSelection(
 					'- Keep Original '.JText::_('COM_COSTBENEFITPROJECTION_INTERVENTION_COMPANY_LABEL').' -',
 					'batch[company]',
@@ -218,11 +218,11 @@ class CostbenefitprojectionViewInterventions extends JViewLegacy
 			}
 		}
 
-		// [9226] Set Type Selection
+		// [9393] Set Type Selection
 		$this->typeOptions = $this->getTheTypeSelections();
 		if ($this->typeOptions)
 		{
-			// [9230] Type Filter
+			// [9397] 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)
 			{
-				// [9239] Type Batch Selection
+				// [9406] Type Batch Selection
 				JHtmlBatch_::addListSelection(
 					'- Keep Original '.JText::_('COM_COSTBENEFITPROJECTION_INTERVENTION_TYPE_LABEL').' -',
 					'batch[type]',
@@ -240,11 +240,11 @@ class CostbenefitprojectionViewInterventions extends JViewLegacy
 			}
 		}
 
-		// [9226] Set Coverage Selection
+		// [9393] Set Coverage Selection
 		$this->coverageOptions = $this->getTheCoverageSelections();
 		if ($this->coverageOptions)
 		{
-			// [9230] Coverage Filter
+			// [9397] 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)
 			{
-				// [9239] Coverage Batch Selection
+				// [9406] Coverage Batch Selection
 				JHtmlBatch_::addListSelection(
 					'- Keep Original '.JText::_('COM_COSTBENEFITPROJECTION_INTERVENTION_COVERAGE_LABEL').' -',
 					'batch[coverage]',
@@ -262,11 +262,11 @@ class CostbenefitprojectionViewInterventions extends JViewLegacy
 			}
 		}
 
-		// [9226] Set Duration Selection
+		// [9393] Set Duration Selection
 		$this->durationOptions = $this->getTheDurationSelections();
 		if ($this->durationOptions)
 		{
-			// [9230] Duration Filter
+			// [9397] 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)
 			{
-				// [9239] Duration Batch Selection
+				// [9406] 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()
 	{
-		// [9102] Get a db connection.
+		// [9269] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [9104] Create a new query object.
+		// [9271] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [9106] Select the text.
+		// [9273] Select the text.
 		$query->select($db->quoteName('type'));
 		$query->from($db->quoteName('#__costbenefitprojection_intervention'));
 		$query->order($db->quoteName('type') . ' ASC');
 
-		// [9110] Reset the query using our newly populated query object.
+		// [9277] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
 		$results = $db->loadColumn();
 
 		if ($results)
 		{
-			// [9118] get model
+			// [9285] get model
 			$model = $this->getModel();
 			$results = array_unique($results);
 			$filter = array();
 			foreach ($results as $type)
 			{
-				// [9129] Translate the type selection
+				// [9296] Translate the type selection
 				$text = $model->selectionTranslation($type,'type');
-				// [9131] Now add the type and its text to the options array
+				// [9298] 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()
 	{
-		// [9102] Get a db connection.
+		// [9269] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [9104] Create a new query object.
+		// [9271] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [9106] Select the text.
+		// [9273] Select the text.
 		$query->select($db->quoteName('coverage'));
 		$query->from($db->quoteName('#__costbenefitprojection_intervention'));
 		$query->order($db->quoteName('coverage') . ' ASC');
 
-		// [9110] Reset the query using our newly populated query object.
+		// [9277] 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)
 			{
-				// [9136] Now add the coverage and its text to the options array
+				// [9303] 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()
 	{
-		// [9102] Get a db connection.
+		// [9269] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [9104] Create a new query object.
+		// [9271] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [9106] Select the text.
+		// [9273] Select the text.
 		$query->select($db->quoteName('duration'));
 		$query->from($db->quoteName('#__costbenefitprojection_intervention'));
 		$query->order($db->quoteName('duration') . ' ASC');
 
-		// [9110] Reset the query using our newly populated query object.
+		// [9277] 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)
 			{
-				// [9136] Now add the duration and its text to the options array
+				// [9303] 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 dba885e2..5f72cd97 100644
--- a/admin/views/scaling_factor/submitbutton.js
+++ b/admin/views/scaling_factor/submitbutton.js
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		submitbutton.js
diff --git a/admin/views/scaling_factor/tmpl/edit.php b/admin/views/scaling_factor/tmpl/edit.php
index 598cb34e..18cf2061 100644
--- a/admin/views/scaling_factor/tmpl/edit.php
+++ b/admin/views/scaling_factor/tmpl/edit.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		edit.php
diff --git a/admin/views/scaling_factor/view.html.php b/admin/views/scaling_factor/view.html.php
index 6ea17df6..758bfbbe 100644
--- a/admin/views/scaling_factor/view.html.php
+++ b/admin/views/scaling_factor/view.html.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
@@ -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');
-		// [10354] Built the actions for new and existing records.
+		// [10525] Built the actions for new and existing records.
 		if ($this->refid || $this->ref)
 		{
 			if ($this->canDo->get('scaling_factor.create') && $isNew)
 			{
-				// [10366] We can create the record.
+				// [10537] We can create the record.
 				JToolBarHelper::save('scaling_factor.save', 'JTOOLBAR_SAVE');
 			}
 			elseif ($this->canDo->get('scaling_factor.edit'))
 			{
-				// [10378] We can save the record.
+				// [10549] We can save the record.
 				JToolBarHelper::save('scaling_factor.save', 'JTOOLBAR_SAVE');
 			}
 			if ($isNew)
 			{
-				// [10383] Do not creat but cancel.
+				// [10554] Do not creat but cancel.
 				JToolBarHelper::cancel('scaling_factor.cancel', 'JTOOLBAR_CANCEL');
 			}
 			else
 			{
-				// [10388] We can close it.
+				// [10559] We can close it.
 				JToolBarHelper::cancel('scaling_factor.cancel', 'JTOOLBAR_CLOSE');
 			}
 		}
@@ -114,7 +114,7 @@ class CostbenefitprojectionViewScaling_factor extends JViewLegacy
 		{
 			if ($isNew)
 			{
-				// [10396] For new records, check the create permission.
+				// [10567] 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'))
 				{
-					// [10423] We can save the new record
+					// [10594] We can save the new record
 					JToolBarHelper::apply('scaling_factor.apply', 'JTOOLBAR_APPLY');
 					JToolBarHelper::save('scaling_factor.save', 'JTOOLBAR_SAVE');
-					// [10426] We can save this record, but check the create permission to see
-					// [10427] if we can return to make a new one.
+					// [10597] We can save this record, but check the create permission to see
+					// [10598] 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();
-		// [10463] set help url for this view if found
+		// [10634] 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 12d3aa19..9faf2178 100644
--- a/admin/views/scaling_factors/tmpl/default.php
+++ b/admin/views/scaling_factors/tmpl/default.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default.php
diff --git a/admin/views/scaling_factors/tmpl/default_batch_body.php b/admin/views/scaling_factors/tmpl/default_batch_body.php
index 3825eb92..2a1413d9 100644
--- a/admin/views/scaling_factors/tmpl/default_batch_body.php
+++ b/admin/views/scaling_factors/tmpl/default_batch_body.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_batch_body.php
diff --git a/admin/views/scaling_factors/tmpl/default_batch_footer.php b/admin/views/scaling_factors/tmpl/default_batch_footer.php
index 8acbf3f2..fb4c282f 100644
--- a/admin/views/scaling_factors/tmpl/default_batch_footer.php
+++ b/admin/views/scaling_factors/tmpl/default_batch_footer.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_batch_footer.php
diff --git a/admin/views/scaling_factors/tmpl/default_body.php b/admin/views/scaling_factors/tmpl/default_body.php
index f3a00921..8bb3f7f9 100644
--- a/admin/views/scaling_factors/tmpl/default_body.php
+++ b/admin/views/scaling_factors/tmpl/default_body.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_body.php
diff --git a/admin/views/scaling_factors/tmpl/default_foot.php b/admin/views/scaling_factors/tmpl/default_foot.php
index 2a0594a4..70df32e1 100644
--- a/admin/views/scaling_factors/tmpl/default_foot.php
+++ b/admin/views/scaling_factors/tmpl/default_foot.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_foot.php
diff --git a/admin/views/scaling_factors/tmpl/default_head.php b/admin/views/scaling_factors/tmpl/default_head.php
index a4eddbb0..e040efcf 100644
--- a/admin/views/scaling_factors/tmpl/default_head.php
+++ b/admin/views/scaling_factors/tmpl/default_head.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_head.php
diff --git a/admin/views/scaling_factors/tmpl/default_toolbar.php b/admin/views/scaling_factors/tmpl/default_toolbar.php
index 50163e46..d3c1e3d8 100644
--- a/admin/views/scaling_factors/tmpl/default_toolbar.php
+++ b/admin/views/scaling_factors/tmpl/default_toolbar.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_toolbar.php
diff --git a/admin/views/scaling_factors/view.html.php b/admin/views/scaling_factors/view.html.php
index ff0c1e41..0f2e1a03 100644
--- a/admin/views/scaling_factors/view.html.php
+++ b/admin/views/scaling_factors/view.html.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
@@ -196,11 +196,11 @@ class CostbenefitprojectionViewScaling_factors extends JViewLegacy
 			);
                 }  
 
-		// [9192] Set Causerisk Name Selection
+		// [9359] Set Causerisk Name Selection
 		$this->causeriskNameOptions = JFormHelper::loadFieldType('Causesrisks')->getOptions();
 		if ($this->causeriskNameOptions)
 		{
-			// [9196] Causerisk Name Filter
+			// [9363] 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)
 			{
-				// [9205] Causerisk Name Batch Selection
+				// [9372] 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
 			}
 		}
 
-		// [9192] Set Company Name Selection
+		// [9359] Set Company Name Selection
 		$this->companyNameOptions = JFormHelper::loadFieldType('Company')->getOptions();
 		if ($this->companyNameOptions)
 		{
-			// [9196] Company Name Filter
+			// [9363] 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)
 			{
-				// [9205] Company Name Batch Selection
+				// [9372] 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 ddc0b8da..568c4f0a 100644
--- a/admin/views/service_provider/submitbutton.js
+++ b/admin/views/service_provider/submitbutton.js
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		submitbutton.js
diff --git a/admin/views/service_provider/tmpl/edit.php b/admin/views/service_provider/tmpl/edit.php
index c2c26bb0..83470087 100644
--- a/admin/views/service_provider/tmpl/edit.php
+++ b/admin/views/service_provider/tmpl/edit.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		edit.php
diff --git a/admin/views/service_provider/view.html.php b/admin/views/service_provider/view.html.php
index bf9bed0f..10759566 100644
--- a/admin/views/service_provider/view.html.php
+++ b/admin/views/service_provider/view.html.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
@@ -64,8 +64,8 @@ class CostbenefitprojectionViewService_provider extends JViewLegacy
                         $this->referral = '&ref='.(string)$this->ref;
                 }
 
-		// [6564] Get Linked view data
-		$this->ogncompanies		= $this->get('Ogncompanies');
+		// [6731] Get Linked view data
+		$this->kfzcompanies		= $this->get('Kfzcompanies');
 
 		// 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');
-		// [10354] Built the actions for new and existing records.
+		// [10525] Built the actions for new and existing records.
 		if ($this->refid || $this->ref)
 		{
 			if ($this->canDo->get('service_provider.create') && $isNew)
 			{
-				// [10366] We can create the record.
+				// [10537] We can create the record.
 				JToolBarHelper::save('service_provider.save', 'JTOOLBAR_SAVE');
 			}
 			elseif ($this->canDo->get('service_provider.edit'))
 			{
-				// [10378] We can save the record.
+				// [10549] We can save the record.
 				JToolBarHelper::save('service_provider.save', 'JTOOLBAR_SAVE');
 			}
 			if ($isNew)
 			{
-				// [10383] Do not creat but cancel.
+				// [10554] Do not creat but cancel.
 				JToolBarHelper::cancel('service_provider.cancel', 'JTOOLBAR_CANCEL');
 			}
 			else
 			{
-				// [10388] We can close it.
+				// [10559] We can close it.
 				JToolBarHelper::cancel('service_provider.cancel', 'JTOOLBAR_CLOSE');
 			}
 		}
@@ -117,7 +117,7 @@ class CostbenefitprojectionViewService_provider extends JViewLegacy
 		{
 			if ($isNew)
 			{
-				// [10396] For new records, check the create permission.
+				// [10567] 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'))
 				{
-					// [10423] We can save the new record
+					// [10594] We can save the new record
 					JToolBarHelper::apply('service_provider.apply', 'JTOOLBAR_APPLY');
 					JToolBarHelper::save('service_provider.save', 'JTOOLBAR_SAVE');
-					// [10426] We can save this record, but check the create permission to see
-					// [10427] if we can return to make a new one.
+					// [10597] We can save this record, but check the create permission to see
+					// [10598] 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();
-		// [10463] set help url for this view if found
+		// [10634] 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"); 
 
-		// [6599] Add the CSS for Footable.
+		// [6766] Add the CSS for Footable.
 		$document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable/css/footable.core.min.css');
 
-		// [6601] Use the Metro Style
+		// [6768] Use the Metro Style
 		if (!isset($this->fooTableStyle) || 0 == $this->fooTableStyle)
 		{
 			$document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable/css/footable.metro.min.css');
 		}
-		// [6606] Use the Legacy Style.
+		// [6773] Use the Legacy Style.
 		elseif (isset($this->fooTableStyle) && 1 == $this->fooTableStyle)
 		{
 			$document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable/css/footable.standalone.min.css');
 		}
 
-		// [6611] Add the JavaScript for Footable
+		// [6778] 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 bea73068..631b8a56 100644
--- a/admin/views/service_providers/tmpl/default.php
+++ b/admin/views/service_providers/tmpl/default.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default.php
diff --git a/admin/views/service_providers/tmpl/default_batch_body.php b/admin/views/service_providers/tmpl/default_batch_body.php
index dc5c461a..306fac5c 100644
--- a/admin/views/service_providers/tmpl/default_batch_body.php
+++ b/admin/views/service_providers/tmpl/default_batch_body.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_batch_body.php
diff --git a/admin/views/service_providers/tmpl/default_batch_footer.php b/admin/views/service_providers/tmpl/default_batch_footer.php
index 5fae3e3f..638dcd53 100644
--- a/admin/views/service_providers/tmpl/default_batch_footer.php
+++ b/admin/views/service_providers/tmpl/default_batch_footer.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_batch_footer.php
diff --git a/admin/views/service_providers/tmpl/default_body.php b/admin/views/service_providers/tmpl/default_body.php
index 73d2ffbe..4c2ab2b9 100644
--- a/admin/views/service_providers/tmpl/default_body.php
+++ b/admin/views/service_providers/tmpl/default_body.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_body.php
diff --git a/admin/views/service_providers/tmpl/default_foot.php b/admin/views/service_providers/tmpl/default_foot.php
index 8d0c624a..98b7c6ce 100644
--- a/admin/views/service_providers/tmpl/default_foot.php
+++ b/admin/views/service_providers/tmpl/default_foot.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_foot.php
diff --git a/admin/views/service_providers/tmpl/default_head.php b/admin/views/service_providers/tmpl/default_head.php
index ac04b28c..fb2969ee 100644
--- a/admin/views/service_providers/tmpl/default_head.php
+++ b/admin/views/service_providers/tmpl/default_head.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_head.php
diff --git a/admin/views/service_providers/tmpl/default_toolbar.php b/admin/views/service_providers/tmpl/default_toolbar.php
index e2265dda..66daa52e 100644
--- a/admin/views/service_providers/tmpl/default_toolbar.php
+++ b/admin/views/service_providers/tmpl/default_toolbar.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_toolbar.php
diff --git a/admin/views/service_providers/view.html.php b/admin/views/service_providers/view.html.php
index 5b4ab5e4..601f8840 100644
--- a/admin/views/service_providers/view.html.php
+++ b/admin/views/service_providers/view.html.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
@@ -196,11 +196,11 @@ class CostbenefitprojectionViewService_providers extends JViewLegacy
 			);
                 }  
 
-		// [9192] Set Country Name Selection
+		// [9359] Set Country Name Selection
 		$this->countryNameOptions = JFormHelper::loadFieldType('Countries')->getOptions();
 		if ($this->countryNameOptions)
 		{
-			// [9196] Country Name Filter
+			// [9363] 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)
 			{
-				// [9205] Country Name Batch Selection
+				// [9372] 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 7a01ff92..b13811f5 100644
--- a/costbenefitprojection.xml
+++ b/costbenefitprojection.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2" method="upgrade">
 	<name>COM_COSTBENEFITPROJECTION</name>
-	<creationDate>17th December, 2015</creationDate>
+	<creationDate>23rd December, 2015</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>llewellyn@vdm.io</authorEmail>
 	<authorUrl>http://www.vdm.io</authorUrl>
@@ -101,5 +101,8 @@ Benefits are calculated based on the model projecting reductions in workdays los
 			<language tag="en-GB">language/en-GB/en-GB.com_costbenefitprojection.sys.ini</language>
 		</languages>
 
-	</administration>
+	</administration>
+	<updateservers>
+		<server type="extension" enabled="1" element="com_costbenefitprojection" name="Cost Benefit Projection">https://www.vdm.io/updates/costbenefitprojection_update_server.xml</server>
+	</updateservers>
 </extension>
\ No newline at end of file
diff --git a/script.php b/script.php
index 7af4ef36..5df504de 100644
--- a/script.php
+++ b/script.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		script.php
@@ -47,794 +47,794 @@ class com_costbenefitprojectionInstallerScript
 	 */
 	function uninstall($parent)
 	{
-		// [4302] Get Application object
+		// [4466] Get Application object
 		$app = JFactory::getApplication();
 
-		// [4304] Get The Database object
+		// [4468] Get The Database object
 		$db = JFactory::getDbo();
 
-		// [4313] Create a new query object.
+		// [4477] Create a new query object.
 		$query = $db->getQuery(true);
-		// [4315] Select id from content type table
+		// [4479] Select id from content type table
 		$query->select($db->quoteName('type_id'));
 		$query->from($db->quoteName('#__content_types'));
-		// [4318] Where Company alias is found
+		// [4482] Where Company alias is found
 		$query->where( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.company') );
 		$db->setQuery($query);
-		// [4321] Execute query to see if alias is found
+		// [4485] Execute query to see if alias is found
 		$db->execute();
 		$company_found = $db->getNumRows();
-		// [4324] Now check if there were any rows
+		// [4488] Now check if there were any rows
 		if ($company_found)
 		{
-			// [4327] Since there are load the needed  company type ids
+			// [4491] Since there are load the needed  company type ids
 			$company_ids = $db->loadColumn();
-			// [4331] Remove Company from the content type table
+			// [4495] Remove Company from the content type table
 			$company_condition = array( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.company') );
-			// [4333] Create a new query object.
+			// [4497] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__content_types'));
 			$query->where($company_condition);
 			$db->setQuery($query);
-			// [4338] Execute the query to remove Company items
+			// [4502] Execute the query to remove Company items
 			$company_done = $db->execute();
 			if ($company_done);
 			{
-				// [4342] If succesfully remove Company add queued success message.
+				// [4506] 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'));
 			}
 
-			// [4348] Remove Company items from the contentitem tag map table
+			// [4512] Remove Company items from the contentitem tag map table
 			$company_condition = array( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.company') );
-			// [4350] Create a new query object.
+			// [4514] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__contentitem_tag_map'));
 			$query->where($company_condition);
 			$db->setQuery($query);
-			// [4355] Execute the query to remove Company items
+			// [4519] Execute the query to remove Company items
 			$company_done = $db->execute();
 			if ($company_done);
 			{
-				// [4359] If succesfully remove Company add queued success message.
+				// [4523] 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'));
 			}
 
-			// [4365] Remove Company items from the ucm content table
+			// [4529] Remove Company items from the ucm content table
 			$company_condition = array( $db->quoteName('core_type_alias') . ' = ' . $db->quote('com_costbenefitprojection.company') );
-			// [4367] Create a new query object.
+			// [4531] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__ucm_content'));
 			$query->where($company_condition);
 			$db->setQuery($query);
-			// [4372] Execute the query to remove Company items
+			// [4536] Execute the query to remove Company items
 			$company_done = $db->execute();
 			if ($company_done);
 			{
-				// [4376] If succesfully remove Company add queued success message.
+				// [4540] 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'));
 			}
 
-			// [4382] Make sure that all the Company items are cleared from DB
+			// [4546] Make sure that all the Company items are cleared from DB
 			foreach ($company_ids as $company_id)
 			{
-				// [4387] Remove Company items from the ucm base table
+				// [4551] Remove Company items from the ucm base table
 				$company_condition = array( $db->quoteName('ucm_type_id') . ' = ' . $company_id);
-				// [4389] Create a new query object.
+				// [4553] Create a new query object.
 				$query = $db->getQuery(true);
 				$query->delete($db->quoteName('#__ucm_base'));
 				$query->where($company_condition);
 				$db->setQuery($query);
-				// [4394] Execute the query to remove Company items
+				// [4558] Execute the query to remove Company items
 				$db->execute();
 
-				// [4398] Remove Company items from the ucm history table
+				// [4562] Remove Company items from the ucm history table
 				$company_condition = array( $db->quoteName('ucm_type_id') . ' = ' . $company_id);
-				// [4400] Create a new query object.
+				// [4564] Create a new query object.
 				$query = $db->getQuery(true);
 				$query->delete($db->quoteName('#__ucm_history'));
 				$query->where($company_condition);
 				$db->setQuery($query);
-				// [4405] Execute the query to remove Company items
+				// [4569] Execute the query to remove Company items
 				$db->execute();
 			}
 		}
 
-		// [4313] Create a new query object.
+		// [4477] Create a new query object.
 		$query = $db->getQuery(true);
-		// [4315] Select id from content type table
+		// [4479] Select id from content type table
 		$query->select($db->quoteName('type_id'));
 		$query->from($db->quoteName('#__content_types'));
-		// [4318] Where Service_provider alias is found
+		// [4482] Where Service_provider alias is found
 		$query->where( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.service_provider') );
 		$db->setQuery($query);
-		// [4321] Execute query to see if alias is found
+		// [4485] Execute query to see if alias is found
 		$db->execute();
 		$service_provider_found = $db->getNumRows();
-		// [4324] Now check if there were any rows
+		// [4488] Now check if there were any rows
 		if ($service_provider_found)
 		{
-			// [4327] Since there are load the needed  service_provider type ids
+			// [4491] Since there are load the needed  service_provider type ids
 			$service_provider_ids = $db->loadColumn();
-			// [4331] Remove Service_provider from the content type table
+			// [4495] Remove Service_provider from the content type table
 			$service_provider_condition = array( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.service_provider') );
-			// [4333] Create a new query object.
+			// [4497] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__content_types'));
 			$query->where($service_provider_condition);
 			$db->setQuery($query);
-			// [4338] Execute the query to remove Service_provider items
+			// [4502] Execute the query to remove Service_provider items
 			$service_provider_done = $db->execute();
 			if ($service_provider_done);
 			{
-				// [4342] If succesfully remove Service_provider add queued success message.
+				// [4506] 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'));
 			}
 
-			// [4348] Remove Service_provider items from the contentitem tag map table
+			// [4512] Remove Service_provider items from the contentitem tag map table
 			$service_provider_condition = array( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.service_provider') );
-			// [4350] Create a new query object.
+			// [4514] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__contentitem_tag_map'));
 			$query->where($service_provider_condition);
 			$db->setQuery($query);
-			// [4355] Execute the query to remove Service_provider items
+			// [4519] Execute the query to remove Service_provider items
 			$service_provider_done = $db->execute();
 			if ($service_provider_done);
 			{
-				// [4359] If succesfully remove Service_provider add queued success message.
+				// [4523] 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'));
 			}
 
-			// [4365] Remove Service_provider items from the ucm content table
+			// [4529] Remove Service_provider items from the ucm content table
 			$service_provider_condition = array( $db->quoteName('core_type_alias') . ' = ' . $db->quote('com_costbenefitprojection.service_provider') );
-			// [4367] Create a new query object.
+			// [4531] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__ucm_content'));
 			$query->where($service_provider_condition);
 			$db->setQuery($query);
-			// [4372] Execute the query to remove Service_provider items
+			// [4536] Execute the query to remove Service_provider items
 			$service_provider_done = $db->execute();
 			if ($service_provider_done);
 			{
-				// [4376] If succesfully remove Service_provider add queued success message.
+				// [4540] 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'));
 			}
 
-			// [4382] Make sure that all the Service_provider items are cleared from DB
+			// [4546] Make sure that all the Service_provider items are cleared from DB
 			foreach ($service_provider_ids as $service_provider_id)
 			{
-				// [4387] Remove Service_provider items from the ucm base table
+				// [4551] Remove Service_provider items from the ucm base table
 				$service_provider_condition = array( $db->quoteName('ucm_type_id') . ' = ' . $service_provider_id);
-				// [4389] Create a new query object.
+				// [4553] Create a new query object.
 				$query = $db->getQuery(true);
 				$query->delete($db->quoteName('#__ucm_base'));
 				$query->where($service_provider_condition);
 				$db->setQuery($query);
-				// [4394] Execute the query to remove Service_provider items
+				// [4558] Execute the query to remove Service_provider items
 				$db->execute();
 
-				// [4398] Remove Service_provider items from the ucm history table
+				// [4562] Remove Service_provider items from the ucm history table
 				$service_provider_condition = array( $db->quoteName('ucm_type_id') . ' = ' . $service_provider_id);
-				// [4400] Create a new query object.
+				// [4564] Create a new query object.
 				$query = $db->getQuery(true);
 				$query->delete($db->quoteName('#__ucm_history'));
 				$query->where($service_provider_condition);
 				$db->setQuery($query);
-				// [4405] Execute the query to remove Service_provider items
+				// [4569] Execute the query to remove Service_provider items
 				$db->execute();
 			}
 		}
 
-		// [4313] Create a new query object.
+		// [4477] Create a new query object.
 		$query = $db->getQuery(true);
-		// [4315] Select id from content type table
+		// [4479] Select id from content type table
 		$query->select($db->quoteName('type_id'));
 		$query->from($db->quoteName('#__content_types'));
-		// [4318] Where Country alias is found
+		// [4482] Where Country alias is found
 		$query->where( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.country') );
 		$db->setQuery($query);
-		// [4321] Execute query to see if alias is found
+		// [4485] Execute query to see if alias is found
 		$db->execute();
 		$country_found = $db->getNumRows();
-		// [4324] Now check if there were any rows
+		// [4488] Now check if there were any rows
 		if ($country_found)
 		{
-			// [4327] Since there are load the needed  country type ids
+			// [4491] Since there are load the needed  country type ids
 			$country_ids = $db->loadColumn();
-			// [4331] Remove Country from the content type table
+			// [4495] Remove Country from the content type table
 			$country_condition = array( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.country') );
-			// [4333] Create a new query object.
+			// [4497] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__content_types'));
 			$query->where($country_condition);
 			$db->setQuery($query);
-			// [4338] Execute the query to remove Country items
+			// [4502] Execute the query to remove Country items
 			$country_done = $db->execute();
 			if ($country_done);
 			{
-				// [4342] If succesfully remove Country add queued success message.
+				// [4506] 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'));
 			}
 
-			// [4348] Remove Country items from the contentitem tag map table
+			// [4512] Remove Country items from the contentitem tag map table
 			$country_condition = array( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.country') );
-			// [4350] Create a new query object.
+			// [4514] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__contentitem_tag_map'));
 			$query->where($country_condition);
 			$db->setQuery($query);
-			// [4355] Execute the query to remove Country items
+			// [4519] Execute the query to remove Country items
 			$country_done = $db->execute();
 			if ($country_done);
 			{
-				// [4359] If succesfully remove Country add queued success message.
+				// [4523] 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'));
 			}
 
-			// [4365] Remove Country items from the ucm content table
+			// [4529] Remove Country items from the ucm content table
 			$country_condition = array( $db->quoteName('core_type_alias') . ' = ' . $db->quote('com_costbenefitprojection.country') );
-			// [4367] Create a new query object.
+			// [4531] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__ucm_content'));
 			$query->where($country_condition);
 			$db->setQuery($query);
-			// [4372] Execute the query to remove Country items
+			// [4536] Execute the query to remove Country items
 			$country_done = $db->execute();
 			if ($country_done);
 			{
-				// [4376] If succesfully remove Country add queued success message.
+				// [4540] 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'));
 			}
 
-			// [4382] Make sure that all the Country items are cleared from DB
+			// [4546] Make sure that all the Country items are cleared from DB
 			foreach ($country_ids as $country_id)
 			{
-				// [4387] Remove Country items from the ucm base table
+				// [4551] Remove Country items from the ucm base table
 				$country_condition = array( $db->quoteName('ucm_type_id') . ' = ' . $country_id);
-				// [4389] Create a new query object.
+				// [4553] Create a new query object.
 				$query = $db->getQuery(true);
 				$query->delete($db->quoteName('#__ucm_base'));
 				$query->where($country_condition);
 				$db->setQuery($query);
-				// [4394] Execute the query to remove Country items
+				// [4558] Execute the query to remove Country items
 				$db->execute();
 
-				// [4398] Remove Country items from the ucm history table
+				// [4562] Remove Country items from the ucm history table
 				$country_condition = array( $db->quoteName('ucm_type_id') . ' = ' . $country_id);
-				// [4400] Create a new query object.
+				// [4564] Create a new query object.
 				$query = $db->getQuery(true);
 				$query->delete($db->quoteName('#__ucm_history'));
 				$query->where($country_condition);
 				$db->setQuery($query);
-				// [4405] Execute the query to remove Country items
+				// [4569] Execute the query to remove Country items
 				$db->execute();
 			}
 		}
 
-		// [4313] Create a new query object.
+		// [4477] Create a new query object.
 		$query = $db->getQuery(true);
-		// [4315] Select id from content type table
+		// [4479] Select id from content type table
 		$query->select($db->quoteName('type_id'));
 		$query->from($db->quoteName('#__content_types'));
-		// [4318] Where Causerisk alias is found
+		// [4482] Where Causerisk alias is found
 		$query->where( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.causerisk') );
 		$db->setQuery($query);
-		// [4321] Execute query to see if alias is found
+		// [4485] Execute query to see if alias is found
 		$db->execute();
 		$causerisk_found = $db->getNumRows();
-		// [4324] Now check if there were any rows
+		// [4488] Now check if there were any rows
 		if ($causerisk_found)
 		{
-			// [4327] Since there are load the needed  causerisk type ids
+			// [4491] Since there are load the needed  causerisk type ids
 			$causerisk_ids = $db->loadColumn();
-			// [4331] Remove Causerisk from the content type table
+			// [4495] Remove Causerisk from the content type table
 			$causerisk_condition = array( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.causerisk') );
-			// [4333] Create a new query object.
+			// [4497] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__content_types'));
 			$query->where($causerisk_condition);
 			$db->setQuery($query);
-			// [4338] Execute the query to remove Causerisk items
+			// [4502] Execute the query to remove Causerisk items
 			$causerisk_done = $db->execute();
 			if ($causerisk_done);
 			{
-				// [4342] If succesfully remove Causerisk add queued success message.
+				// [4506] 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'));
 			}
 
-			// [4348] Remove Causerisk items from the contentitem tag map table
+			// [4512] Remove Causerisk items from the contentitem tag map table
 			$causerisk_condition = array( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.causerisk') );
-			// [4350] Create a new query object.
+			// [4514] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__contentitem_tag_map'));
 			$query->where($causerisk_condition);
 			$db->setQuery($query);
-			// [4355] Execute the query to remove Causerisk items
+			// [4519] Execute the query to remove Causerisk items
 			$causerisk_done = $db->execute();
 			if ($causerisk_done);
 			{
-				// [4359] If succesfully remove Causerisk add queued success message.
+				// [4523] 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'));
 			}
 
-			// [4365] Remove Causerisk items from the ucm content table
+			// [4529] Remove Causerisk items from the ucm content table
 			$causerisk_condition = array( $db->quoteName('core_type_alias') . ' = ' . $db->quote('com_costbenefitprojection.causerisk') );
-			// [4367] Create a new query object.
+			// [4531] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__ucm_content'));
 			$query->where($causerisk_condition);
 			$db->setQuery($query);
-			// [4372] Execute the query to remove Causerisk items
+			// [4536] Execute the query to remove Causerisk items
 			$causerisk_done = $db->execute();
 			if ($causerisk_done);
 			{
-				// [4376] If succesfully remove Causerisk add queued success message.
+				// [4540] 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'));
 			}
 
-			// [4382] Make sure that all the Causerisk items are cleared from DB
+			// [4546] Make sure that all the Causerisk items are cleared from DB
 			foreach ($causerisk_ids as $causerisk_id)
 			{
-				// [4387] Remove Causerisk items from the ucm base table
+				// [4551] Remove Causerisk items from the ucm base table
 				$causerisk_condition = array( $db->quoteName('ucm_type_id') . ' = ' . $causerisk_id);
-				// [4389] Create a new query object.
+				// [4553] Create a new query object.
 				$query = $db->getQuery(true);
 				$query->delete($db->quoteName('#__ucm_base'));
 				$query->where($causerisk_condition);
 				$db->setQuery($query);
-				// [4394] Execute the query to remove Causerisk items
+				// [4558] Execute the query to remove Causerisk items
 				$db->execute();
 
-				// [4398] Remove Causerisk items from the ucm history table
+				// [4562] Remove Causerisk items from the ucm history table
 				$causerisk_condition = array( $db->quoteName('ucm_type_id') . ' = ' . $causerisk_id);
-				// [4400] Create a new query object.
+				// [4564] Create a new query object.
 				$query = $db->getQuery(true);
 				$query->delete($db->quoteName('#__ucm_history'));
 				$query->where($causerisk_condition);
 				$db->setQuery($query);
-				// [4405] Execute the query to remove Causerisk items
+				// [4569] Execute the query to remove Causerisk items
 				$db->execute();
 			}
 		}
 
-		// [4313] Create a new query object.
+		// [4477] Create a new query object.
 		$query = $db->getQuery(true);
-		// [4315] Select id from content type table
+		// [4479] Select id from content type table
 		$query->select($db->quoteName('type_id'));
 		$query->from($db->quoteName('#__content_types'));
-		// [4318] Where Health_data alias is found
+		// [4482] Where Health_data alias is found
 		$query->where( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.health_data') );
 		$db->setQuery($query);
-		// [4321] Execute query to see if alias is found
+		// [4485] Execute query to see if alias is found
 		$db->execute();
 		$health_data_found = $db->getNumRows();
-		// [4324] Now check if there were any rows
+		// [4488] Now check if there were any rows
 		if ($health_data_found)
 		{
-			// [4327] Since there are load the needed  health_data type ids
+			// [4491] Since there are load the needed  health_data type ids
 			$health_data_ids = $db->loadColumn();
-			// [4331] Remove Health_data from the content type table
+			// [4495] Remove Health_data from the content type table
 			$health_data_condition = array( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.health_data') );
-			// [4333] Create a new query object.
+			// [4497] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__content_types'));
 			$query->where($health_data_condition);
 			$db->setQuery($query);
-			// [4338] Execute the query to remove Health_data items
+			// [4502] Execute the query to remove Health_data items
 			$health_data_done = $db->execute();
 			if ($health_data_done);
 			{
-				// [4342] If succesfully remove Health_data add queued success message.
+				// [4506] 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'));
 			}
 
-			// [4348] Remove Health_data items from the contentitem tag map table
+			// [4512] Remove Health_data items from the contentitem tag map table
 			$health_data_condition = array( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.health_data') );
-			// [4350] Create a new query object.
+			// [4514] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__contentitem_tag_map'));
 			$query->where($health_data_condition);
 			$db->setQuery($query);
-			// [4355] Execute the query to remove Health_data items
+			// [4519] Execute the query to remove Health_data items
 			$health_data_done = $db->execute();
 			if ($health_data_done);
 			{
-				// [4359] If succesfully remove Health_data add queued success message.
+				// [4523] 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'));
 			}
 
-			// [4365] Remove Health_data items from the ucm content table
+			// [4529] Remove Health_data items from the ucm content table
 			$health_data_condition = array( $db->quoteName('core_type_alias') . ' = ' . $db->quote('com_costbenefitprojection.health_data') );
-			// [4367] Create a new query object.
+			// [4531] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__ucm_content'));
 			$query->where($health_data_condition);
 			$db->setQuery($query);
-			// [4372] Execute the query to remove Health_data items
+			// [4536] Execute the query to remove Health_data items
 			$health_data_done = $db->execute();
 			if ($health_data_done);
 			{
-				// [4376] If succesfully remove Health_data add queued success message.
+				// [4540] 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'));
 			}
 
-			// [4382] Make sure that all the Health_data items are cleared from DB
+			// [4546] Make sure that all the Health_data items are cleared from DB
 			foreach ($health_data_ids as $health_data_id)
 			{
-				// [4387] Remove Health_data items from the ucm base table
+				// [4551] Remove Health_data items from the ucm base table
 				$health_data_condition = array( $db->quoteName('ucm_type_id') . ' = ' . $health_data_id);
-				// [4389] Create a new query object.
+				// [4553] Create a new query object.
 				$query = $db->getQuery(true);
 				$query->delete($db->quoteName('#__ucm_base'));
 				$query->where($health_data_condition);
 				$db->setQuery($query);
-				// [4394] Execute the query to remove Health_data items
+				// [4558] Execute the query to remove Health_data items
 				$db->execute();
 
-				// [4398] Remove Health_data items from the ucm history table
+				// [4562] Remove Health_data items from the ucm history table
 				$health_data_condition = array( $db->quoteName('ucm_type_id') . ' = ' . $health_data_id);
-				// [4400] Create a new query object.
+				// [4564] Create a new query object.
 				$query = $db->getQuery(true);
 				$query->delete($db->quoteName('#__ucm_history'));
 				$query->where($health_data_condition);
 				$db->setQuery($query);
-				// [4405] Execute the query to remove Health_data items
+				// [4569] Execute the query to remove Health_data items
 				$db->execute();
 			}
 		}
 
-		// [4313] Create a new query object.
+		// [4477] Create a new query object.
 		$query = $db->getQuery(true);
-		// [4315] Select id from content type table
+		// [4479] Select id from content type table
 		$query->select($db->quoteName('type_id'));
 		$query->from($db->quoteName('#__content_types'));
-		// [4318] Where Scaling_factor alias is found
+		// [4482] Where Scaling_factor alias is found
 		$query->where( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.scaling_factor') );
 		$db->setQuery($query);
-		// [4321] Execute query to see if alias is found
+		// [4485] Execute query to see if alias is found
 		$db->execute();
 		$scaling_factor_found = $db->getNumRows();
-		// [4324] Now check if there were any rows
+		// [4488] Now check if there were any rows
 		if ($scaling_factor_found)
 		{
-			// [4327] Since there are load the needed  scaling_factor type ids
+			// [4491] Since there are load the needed  scaling_factor type ids
 			$scaling_factor_ids = $db->loadColumn();
-			// [4331] Remove Scaling_factor from the content type table
+			// [4495] Remove Scaling_factor from the content type table
 			$scaling_factor_condition = array( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.scaling_factor') );
-			// [4333] Create a new query object.
+			// [4497] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__content_types'));
 			$query->where($scaling_factor_condition);
 			$db->setQuery($query);
-			// [4338] Execute the query to remove Scaling_factor items
+			// [4502] Execute the query to remove Scaling_factor items
 			$scaling_factor_done = $db->execute();
 			if ($scaling_factor_done);
 			{
-				// [4342] If succesfully remove Scaling_factor add queued success message.
+				// [4506] 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'));
 			}
 
-			// [4348] Remove Scaling_factor items from the contentitem tag map table
+			// [4512] Remove Scaling_factor items from the contentitem tag map table
 			$scaling_factor_condition = array( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.scaling_factor') );
-			// [4350] Create a new query object.
+			// [4514] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__contentitem_tag_map'));
 			$query->where($scaling_factor_condition);
 			$db->setQuery($query);
-			// [4355] Execute the query to remove Scaling_factor items
+			// [4519] Execute the query to remove Scaling_factor items
 			$scaling_factor_done = $db->execute();
 			if ($scaling_factor_done);
 			{
-				// [4359] If succesfully remove Scaling_factor add queued success message.
+				// [4523] 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'));
 			}
 
-			// [4365] Remove Scaling_factor items from the ucm content table
+			// [4529] Remove Scaling_factor items from the ucm content table
 			$scaling_factor_condition = array( $db->quoteName('core_type_alias') . ' = ' . $db->quote('com_costbenefitprojection.scaling_factor') );
-			// [4367] Create a new query object.
+			// [4531] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__ucm_content'));
 			$query->where($scaling_factor_condition);
 			$db->setQuery($query);
-			// [4372] Execute the query to remove Scaling_factor items
+			// [4536] Execute the query to remove Scaling_factor items
 			$scaling_factor_done = $db->execute();
 			if ($scaling_factor_done);
 			{
-				// [4376] If succesfully remove Scaling_factor add queued success message.
+				// [4540] 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'));
 			}
 
-			// [4382] Make sure that all the Scaling_factor items are cleared from DB
+			// [4546] Make sure that all the Scaling_factor items are cleared from DB
 			foreach ($scaling_factor_ids as $scaling_factor_id)
 			{
-				// [4387] Remove Scaling_factor items from the ucm base table
+				// [4551] Remove Scaling_factor items from the ucm base table
 				$scaling_factor_condition = array( $db->quoteName('ucm_type_id') . ' = ' . $scaling_factor_id);
-				// [4389] Create a new query object.
+				// [4553] Create a new query object.
 				$query = $db->getQuery(true);
 				$query->delete($db->quoteName('#__ucm_base'));
 				$query->where($scaling_factor_condition);
 				$db->setQuery($query);
-				// [4394] Execute the query to remove Scaling_factor items
+				// [4558] Execute the query to remove Scaling_factor items
 				$db->execute();
 
-				// [4398] Remove Scaling_factor items from the ucm history table
+				// [4562] Remove Scaling_factor items from the ucm history table
 				$scaling_factor_condition = array( $db->quoteName('ucm_type_id') . ' = ' . $scaling_factor_id);
-				// [4400] Create a new query object.
+				// [4564] Create a new query object.
 				$query = $db->getQuery(true);
 				$query->delete($db->quoteName('#__ucm_history'));
 				$query->where($scaling_factor_condition);
 				$db->setQuery($query);
-				// [4405] Execute the query to remove Scaling_factor items
+				// [4569] Execute the query to remove Scaling_factor items
 				$db->execute();
 			}
 		}
 
-		// [4313] Create a new query object.
+		// [4477] Create a new query object.
 		$query = $db->getQuery(true);
-		// [4315] Select id from content type table
+		// [4479] Select id from content type table
 		$query->select($db->quoteName('type_id'));
 		$query->from($db->quoteName('#__content_types'));
-		// [4318] Where Intervention alias is found
+		// [4482] Where Intervention alias is found
 		$query->where( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.intervention') );
 		$db->setQuery($query);
-		// [4321] Execute query to see if alias is found
+		// [4485] Execute query to see if alias is found
 		$db->execute();
 		$intervention_found = $db->getNumRows();
-		// [4324] Now check if there were any rows
+		// [4488] Now check if there were any rows
 		if ($intervention_found)
 		{
-			// [4327] Since there are load the needed  intervention type ids
+			// [4491] Since there are load the needed  intervention type ids
 			$intervention_ids = $db->loadColumn();
-			// [4331] Remove Intervention from the content type table
+			// [4495] Remove Intervention from the content type table
 			$intervention_condition = array( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.intervention') );
-			// [4333] Create a new query object.
+			// [4497] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__content_types'));
 			$query->where($intervention_condition);
 			$db->setQuery($query);
-			// [4338] Execute the query to remove Intervention items
+			// [4502] Execute the query to remove Intervention items
 			$intervention_done = $db->execute();
 			if ($intervention_done);
 			{
-				// [4342] If succesfully remove Intervention add queued success message.
+				// [4506] 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'));
 			}
 
-			// [4348] Remove Intervention items from the contentitem tag map table
+			// [4512] Remove Intervention items from the contentitem tag map table
 			$intervention_condition = array( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.intervention') );
-			// [4350] Create a new query object.
+			// [4514] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__contentitem_tag_map'));
 			$query->where($intervention_condition);
 			$db->setQuery($query);
-			// [4355] Execute the query to remove Intervention items
+			// [4519] Execute the query to remove Intervention items
 			$intervention_done = $db->execute();
 			if ($intervention_done);
 			{
-				// [4359] If succesfully remove Intervention add queued success message.
+				// [4523] 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'));
 			}
 
-			// [4365] Remove Intervention items from the ucm content table
+			// [4529] Remove Intervention items from the ucm content table
 			$intervention_condition = array( $db->quoteName('core_type_alias') . ' = ' . $db->quote('com_costbenefitprojection.intervention') );
-			// [4367] Create a new query object.
+			// [4531] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__ucm_content'));
 			$query->where($intervention_condition);
 			$db->setQuery($query);
-			// [4372] Execute the query to remove Intervention items
+			// [4536] Execute the query to remove Intervention items
 			$intervention_done = $db->execute();
 			if ($intervention_done);
 			{
-				// [4376] If succesfully remove Intervention add queued success message.
+				// [4540] 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'));
 			}
 
-			// [4382] Make sure that all the Intervention items are cleared from DB
+			// [4546] Make sure that all the Intervention items are cleared from DB
 			foreach ($intervention_ids as $intervention_id)
 			{
-				// [4387] Remove Intervention items from the ucm base table
+				// [4551] Remove Intervention items from the ucm base table
 				$intervention_condition = array( $db->quoteName('ucm_type_id') . ' = ' . $intervention_id);
-				// [4389] Create a new query object.
+				// [4553] Create a new query object.
 				$query = $db->getQuery(true);
 				$query->delete($db->quoteName('#__ucm_base'));
 				$query->where($intervention_condition);
 				$db->setQuery($query);
-				// [4394] Execute the query to remove Intervention items
+				// [4558] Execute the query to remove Intervention items
 				$db->execute();
 
-				// [4398] Remove Intervention items from the ucm history table
+				// [4562] Remove Intervention items from the ucm history table
 				$intervention_condition = array( $db->quoteName('ucm_type_id') . ' = ' . $intervention_id);
-				// [4400] Create a new query object.
+				// [4564] Create a new query object.
 				$query = $db->getQuery(true);
 				$query->delete($db->quoteName('#__ucm_history'));
 				$query->where($intervention_condition);
 				$db->setQuery($query);
-				// [4405] Execute the query to remove Intervention items
+				// [4569] Execute the query to remove Intervention items
 				$db->execute();
 			}
 		}
 
-		// [4313] Create a new query object.
+		// [4477] Create a new query object.
 		$query = $db->getQuery(true);
-		// [4315] Select id from content type table
+		// [4479] Select id from content type table
 		$query->select($db->quoteName('type_id'));
 		$query->from($db->quoteName('#__content_types'));
-		// [4318] Where Currency alias is found
+		// [4482] Where Currency alias is found
 		$query->where( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.currency') );
 		$db->setQuery($query);
-		// [4321] Execute query to see if alias is found
+		// [4485] Execute query to see if alias is found
 		$db->execute();
 		$currency_found = $db->getNumRows();
-		// [4324] Now check if there were any rows
+		// [4488] Now check if there were any rows
 		if ($currency_found)
 		{
-			// [4327] Since there are load the needed  currency type ids
+			// [4491] Since there are load the needed  currency type ids
 			$currency_ids = $db->loadColumn();
-			// [4331] Remove Currency from the content type table
+			// [4495] Remove Currency from the content type table
 			$currency_condition = array( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.currency') );
-			// [4333] Create a new query object.
+			// [4497] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__content_types'));
 			$query->where($currency_condition);
 			$db->setQuery($query);
-			// [4338] Execute the query to remove Currency items
+			// [4502] Execute the query to remove Currency items
 			$currency_done = $db->execute();
 			if ($currency_done);
 			{
-				// [4342] If succesfully remove Currency add queued success message.
+				// [4506] 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'));
 			}
 
-			// [4348] Remove Currency items from the contentitem tag map table
+			// [4512] Remove Currency items from the contentitem tag map table
 			$currency_condition = array( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.currency') );
-			// [4350] Create a new query object.
+			// [4514] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__contentitem_tag_map'));
 			$query->where($currency_condition);
 			$db->setQuery($query);
-			// [4355] Execute the query to remove Currency items
+			// [4519] Execute the query to remove Currency items
 			$currency_done = $db->execute();
 			if ($currency_done);
 			{
-				// [4359] If succesfully remove Currency add queued success message.
+				// [4523] 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'));
 			}
 
-			// [4365] Remove Currency items from the ucm content table
+			// [4529] Remove Currency items from the ucm content table
 			$currency_condition = array( $db->quoteName('core_type_alias') . ' = ' . $db->quote('com_costbenefitprojection.currency') );
-			// [4367] Create a new query object.
+			// [4531] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__ucm_content'));
 			$query->where($currency_condition);
 			$db->setQuery($query);
-			// [4372] Execute the query to remove Currency items
+			// [4536] Execute the query to remove Currency items
 			$currency_done = $db->execute();
 			if ($currency_done);
 			{
-				// [4376] If succesfully remove Currency add queued success message.
+				// [4540] 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'));
 			}
 
-			// [4382] Make sure that all the Currency items are cleared from DB
+			// [4546] Make sure that all the Currency items are cleared from DB
 			foreach ($currency_ids as $currency_id)
 			{
-				// [4387] Remove Currency items from the ucm base table
+				// [4551] Remove Currency items from the ucm base table
 				$currency_condition = array( $db->quoteName('ucm_type_id') . ' = ' . $currency_id);
-				// [4389] Create a new query object.
+				// [4553] Create a new query object.
 				$query = $db->getQuery(true);
 				$query->delete($db->quoteName('#__ucm_base'));
 				$query->where($currency_condition);
 				$db->setQuery($query);
-				// [4394] Execute the query to remove Currency items
+				// [4558] Execute the query to remove Currency items
 				$db->execute();
 
-				// [4398] Remove Currency items from the ucm history table
+				// [4562] Remove Currency items from the ucm history table
 				$currency_condition = array( $db->quoteName('ucm_type_id') . ' = ' . $currency_id);
-				// [4400] Create a new query object.
+				// [4564] Create a new query object.
 				$query = $db->getQuery(true);
 				$query->delete($db->quoteName('#__ucm_history'));
 				$query->where($currency_condition);
 				$db->setQuery($query);
-				// [4405] Execute the query to remove Currency items
+				// [4569] Execute the query to remove Currency items
 				$db->execute();
 			}
 		}
 
-		// [4313] Create a new query object.
+		// [4477] Create a new query object.
 		$query = $db->getQuery(true);
-		// [4315] Select id from content type table
+		// [4479] Select id from content type table
 		$query->select($db->quoteName('type_id'));
 		$query->from($db->quoteName('#__content_types'));
-		// [4318] Where Help_document alias is found
+		// [4482] Where Help_document alias is found
 		$query->where( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.help_document') );
 		$db->setQuery($query);
-		// [4321] Execute query to see if alias is found
+		// [4485] Execute query to see if alias is found
 		$db->execute();
 		$help_document_found = $db->getNumRows();
-		// [4324] Now check if there were any rows
+		// [4488] Now check if there were any rows
 		if ($help_document_found)
 		{
-			// [4327] Since there are load the needed  help_document type ids
+			// [4491] Since there are load the needed  help_document type ids
 			$help_document_ids = $db->loadColumn();
-			// [4331] Remove Help_document from the content type table
+			// [4495] Remove Help_document from the content type table
 			$help_document_condition = array( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.help_document') );
-			// [4333] Create a new query object.
+			// [4497] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__content_types'));
 			$query->where($help_document_condition);
 			$db->setQuery($query);
-			// [4338] Execute the query to remove Help_document items
+			// [4502] Execute the query to remove Help_document items
 			$help_document_done = $db->execute();
 			if ($help_document_done);
 			{
-				// [4342] If succesfully remove Help_document add queued success message.
+				// [4506] 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'));
 			}
 
-			// [4348] Remove Help_document items from the contentitem tag map table
+			// [4512] Remove Help_document items from the contentitem tag map table
 			$help_document_condition = array( $db->quoteName('type_alias') . ' = '. $db->quote('com_costbenefitprojection.help_document') );
-			// [4350] Create a new query object.
+			// [4514] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__contentitem_tag_map'));
 			$query->where($help_document_condition);
 			$db->setQuery($query);
-			// [4355] Execute the query to remove Help_document items
+			// [4519] Execute the query to remove Help_document items
 			$help_document_done = $db->execute();
 			if ($help_document_done);
 			{
-				// [4359] If succesfully remove Help_document add queued success message.
+				// [4523] 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'));
 			}
 
-			// [4365] Remove Help_document items from the ucm content table
+			// [4529] Remove Help_document items from the ucm content table
 			$help_document_condition = array( $db->quoteName('core_type_alias') . ' = ' . $db->quote('com_costbenefitprojection.help_document') );
-			// [4367] Create a new query object.
+			// [4531] Create a new query object.
 			$query = $db->getQuery(true);
 			$query->delete($db->quoteName('#__ucm_content'));
 			$query->where($help_document_condition);
 			$db->setQuery($query);
-			// [4372] Execute the query to remove Help_document items
+			// [4536] Execute the query to remove Help_document items
 			$help_document_done = $db->execute();
 			if ($help_document_done);
 			{
-				// [4376] If succesfully remove Help_document add queued success message.
+				// [4540] 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'));
 			}
 
-			// [4382] Make sure that all the Help_document items are cleared from DB
+			// [4546] Make sure that all the Help_document items are cleared from DB
 			foreach ($help_document_ids as $help_document_id)
 			{
-				// [4387] Remove Help_document items from the ucm base table
+				// [4551] Remove Help_document items from the ucm base table
 				$help_document_condition = array( $db->quoteName('ucm_type_id') . ' = ' . $help_document_id);
-				// [4389] Create a new query object.
+				// [4553] Create a new query object.
 				$query = $db->getQuery(true);
 				$query->delete($db->quoteName('#__ucm_base'));
 				$query->where($help_document_condition);
 				$db->setQuery($query);
-				// [4394] Execute the query to remove Help_document items
+				// [4558] Execute the query to remove Help_document items
 				$db->execute();
 
-				// [4398] Remove Help_document items from the ucm history table
+				// [4562] Remove Help_document items from the ucm history table
 				$help_document_condition = array( $db->quoteName('ucm_type_id') . ' = ' . $help_document_id);
-				// [4400] Create a new query object.
+				// [4564] Create a new query object.
 				$query = $db->getQuery(true);
 				$query->delete($db->quoteName('#__ucm_history'));
 				$query->where($help_document_condition);
 				$db->setQuery($query);
-				// [4405] Execute the query to remove Help_document items
+				// [4569] Execute the query to remove Help_document items
 				$db->execute();
 			}
 		}
 
-		// [4413] If All related items was removed queued success message.
+		// [4577] 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'));
 
-		// [4418] Remove costbenefitprojection assets from the assets table
+		// [4582] Remove costbenefitprojection assets from the assets table
 		$costbenefitprojection_condition = array( $db->quoteName('name') . ' LIKE ' . $db->quote('com_costbenefitprojection%') );
 
-		// [4420] Create a new query object.
+		// [4584] 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);
 		{
-			// [4428] If succesfully remove costbenefitprojection add queued success message.
+			// [4592] 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')
 		{
 
-			// [4474] Get The Database object
+			// [4638] Get The Database object
 
 			$db = JFactory::getDbo();
 
-			// [4481] Create the company content type object.
+			// [4645] 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"}]}';
 
-			// [4487] Insert the object into the content types table.
+			// [4651] Insert the object into the content types table.
 			$companyInserted = $db->insertObject('#__content_types', $company);
 
-			// [4481] Create the service_provider content type object.
+			// [4645] 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"}]}';
 
-			// [4487] Insert the object into the content types table.
+			// [4651] Insert the object into the content types table.
 			$service_providerInserted = $db->insertObject('#__content_types', $service_provider);
 
-			// [4481] Create the country content type object.
+			// [4645] 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"}]}';
 
-			// [4487] Insert the object into the content types table.
+			// [4651] Insert the object into the content types table.
 			$countryInserted = $db->insertObject('#__content_types', $country);
 
-			// [4481] Create the causerisk content type object.
+			// [4645] 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"}]}';
 
-			// [4487] Insert the object into the content types table.
+			// [4651] Insert the object into the content types table.
 			$causeriskInserted = $db->insertObject('#__content_types', $causerisk);
 
-			// [4481] Create the health_data content type object.
+			// [4645] 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"}]}';
 
-			// [4487] Insert the object into the content types table.
+			// [4651] Insert the object into the content types table.
 			$health_dataInserted = $db->insertObject('#__content_types', $health_data);
 
-			// [4481] Create the scaling_factor content type object.
+			// [4645] 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"}]}';
 
-			// [4487] Insert the object into the content types table.
+			// [4651] Insert the object into the content types table.
 			$scaling_factorInserted = $db->insertObject('#__content_types', $scaling_factor);
 
-			// [4481] Create the intervention content type object.
+			// [4645] 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"}]}';
 
-			// [4487] Insert the object into the content types table.
+			// [4651] Insert the object into the content types table.
 			$interventionInserted = $db->insertObject('#__content_types', $intervention);
 
-			// [4481] Create the currency content type object.
+			// [4645] 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"}]}';
 
-			// [4487] Insert the object into the content types table.
+			// [4651] Insert the object into the content types table.
 			$currencyInserted = $db->insertObject('#__content_types', $currency);
 
-			// [4481] Create the help_document content type object.
+			// [4645] 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"}]}';
 
-			// [4487] Insert the object into the content types table.
+			// [4651] Insert the object into the content types table.
 			$help_documentInserted = $db->insertObject('#__content_types', $help_document);
 
 
-			// [4499] Install the global extenstion params.
+			// [4663] Install the global extenstion params.
 			$query = $db->getQuery(true);
 
-			// [4507] Field to update.
+			// [4671] 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"}'),
 			);
 
-			// [4511] Condition.
+			// [4675] Condition.
 			$conditions = array(
 				$db->quoteName('element') . ' = ' . $db->quote('com_costbenefitprojection')
 			);
diff --git a/site/assets/css/combinedresults.css b/site/assets/css/combinedresults.css
index cdf99811..e773aa1d 100644
--- a/site/assets/css/combinedresults.css
+++ b/site/assets/css/combinedresults.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		combinedresults.css
diff --git a/site/assets/css/company.css b/site/assets/css/company.css
index ddd8eb43..a5695e6e 100644
--- a/site/assets/css/company.css
+++ b/site/assets/css/company.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		company.css
diff --git a/site/assets/css/companyresults.css b/site/assets/css/companyresults.css
index 9659477f..a485c5fd 100644
--- a/site/assets/css/companyresults.css
+++ b/site/assets/css/companyresults.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		companyresults.css
diff --git a/site/assets/css/cpanel.css b/site/assets/css/cpanel.css
index 24f33b4b..fa301ffa 100644
--- a/site/assets/css/cpanel.css
+++ b/site/assets/css/cpanel.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		cpanel.css
diff --git a/site/assets/css/createaccount.css b/site/assets/css/createaccount.css
index 71fac935..5fe8b9ea 100644
--- a/site/assets/css/createaccount.css
+++ b/site/assets/css/createaccount.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		createaccount.css
diff --git a/site/assets/css/intervention.css b/site/assets/css/intervention.css
index 551cb896..9f7e1964 100644
--- a/site/assets/css/intervention.css
+++ b/site/assets/css/intervention.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		intervention.css
diff --git a/site/assets/css/publicresults.css b/site/assets/css/publicresults.css
index eaaf3857..16069b48 100644
--- a/site/assets/css/publicresults.css
+++ b/site/assets/css/publicresults.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publicresults.css
diff --git a/site/assets/css/scaling_factor.css b/site/assets/css/scaling_factor.css
index 6f70dd8e..51d333cb 100644
--- a/site/assets/css/scaling_factor.css
+++ b/site/assets/css/scaling_factor.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		scaling_factor.css
diff --git a/site/assets/css/site.css b/site/assets/css/site.css
index c6c7986e..85be753a 100644
--- a/site/assets/css/site.css
+++ b/site/assets/css/site.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		site.css
diff --git a/site/controller.php b/site/controller.php
index 5b6c6282..b08a10da 100644
--- a/site/controller.php
+++ b/site/controller.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		controller.php
diff --git a/site/controllers/ajax.json.php b/site/controllers/ajax.json.php
index 47232e00..e81182ee 100644
--- a/site/controllers/ajax.json.php
+++ b/site/controllers/ajax.json.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		ajax.json.php
diff --git a/site/controllers/company.php b/site/controllers/company.php
index 9e45519d..24cb18c8 100644
--- a/site/controllers/company.php
+++ b/site/controllers/company.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		company.php
@@ -54,13 +54,13 @@ class CostbenefitprojectionControllerCompany extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
-		// [9404] Access check.
+		// [9571] Access check.
 		$access = JFactory::getUser()->authorise('company.access', 'com_costbenefitprojection');
 		if (!$access)
 		{
 			return false;
 		}
-		// [9415] In the absense of better information, revert to the component permissions.
+		// [9582] 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')
 	{
-		// [9558] get user object.
+		// [9725] get user object.
 		$user		= JFactory::getUser();
-		// [9560] get record id.
+		// [9727] 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;
 		}
 
-		// [9567] Access check.
+		// [9734] 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)
 		{
-			// [9576] The record has been set. Check the record permissions.
+			// [9743] 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))
 				{
-					// [9598] Now test the owner is the user.
+					// [9765] Now test the owner is the user.
 					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
 					if (empty($ownerId))
 					{
-						// [9602] Need to do a lookup from the model.
+						// [9769] 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;
 					}
 
-					// [9610] If the owner matches 'me' then allow.
+					// [9777] 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;
 			}
 		}
-		// [9632] Since there is no permission, revert to the component permissions.
+		// [9799] 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 828de264..8ae49317 100644
--- a/site/controllers/help.php
+++ b/site/controllers/help.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		help.php
diff --git a/site/controllers/intervention.php b/site/controllers/intervention.php
index f609a4e0..8a68ff13 100644
--- a/site/controllers/intervention.php
+++ b/site/controllers/intervention.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		intervention.php
@@ -54,13 +54,13 @@ class CostbenefitprojectionControllerIntervention extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
-		// [9404] Access check.
+		// [9571] Access check.
 		$access = JFactory::getUser()->authorise('intervention.access', 'com_costbenefitprojection');
 		if (!$access)
 		{
 			return false;
 		}
-		// [9415] In the absense of better information, revert to the component permissions.
+		// [9582] 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')
 	{
-		// [9558] get user object.
+		// [9725] get user object.
 		$user		= JFactory::getUser();
-		// [9560] get record id.
+		// [9727] 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;
 		}
 
-		// [9567] Access check.
+		// [9734] 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)
 		{
-			// [9576] The record has been set. Check the record permissions.
+			// [9743] 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))
 				{
-					// [9598] Now test the owner is the user.
+					// [9765] Now test the owner is the user.
 					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
 					if (empty($ownerId))
 					{
-						// [9602] Need to do a lookup from the model.
+						// [9769] 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;
 					}
 
-					// [9610] If the owner matches 'me' then allow.
+					// [9777] 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;
 			}
 		}
-		// [9632] Since there is no permission, revert to the component permissions.
+		// [9799] 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 93a2c58d..2bc12a0e 100644
--- a/site/controllers/scaling_factor.php
+++ b/site/controllers/scaling_factor.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		scaling_factor.php
@@ -54,13 +54,13 @@ class CostbenefitprojectionControllerScaling_factor extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
-		// [9404] Access check.
+		// [9571] Access check.
 		$access = JFactory::getUser()->authorise('scaling_factor.access', 'com_costbenefitprojection');
 		if (!$access)
 		{
 			return false;
 		}
-		// [9415] In the absense of better information, revert to the component permissions.
+		// [9582] 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')
 	{
-		// [9558] get user object.
+		// [9725] get user object.
 		$user		= JFactory::getUser();
-		// [9560] get record id.
+		// [9727] 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
 			}
 		}
 
-		// [9567] Access check.
+		// [9734] 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)
 		{
-			// [9576] The record has been set. Check the record permissions.
+			// [9743] 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))
 				{
-					// [9598] Now test the owner is the user.
+					// [9765] Now test the owner is the user.
 					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
 					if (empty($ownerId))
 					{
-						// [9602] Need to do a lookup from the model.
+						// [9769] 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;
 					}
 
-					// [9610] If the owner matches 'me' then allow.
+					// [9777] 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;
 			}
 		}
-		// [9632] Since there is no permission, revert to the component permissions.
+		// [9799] 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 d8511a69..641a7d9d 100644
--- a/site/costbenefitprojection.php
+++ b/site/costbenefitprojection.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		costbenefitprojection.php
diff --git a/site/helpers/costbenefitprojection.php b/site/helpers/costbenefitprojection.php
index 7d98d7f6..23c68243 100644
--- a/site/helpers/costbenefitprojection.php
+++ b/site/helpers/costbenefitprojection.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		costbenefitprojection.php
@@ -711,23 +711,23 @@ abstract class CostbenefitprojectionHelper
 						$targetgroups = json_decode($help->groups, true);
 						if (!array_intersect($targetgroups, $groups))
 						{
-							// [1401] if user not in those target groups then remove the item
+							// [1482] if user not in those target groups then remove the item
 							unset($helps[$nr]);
 							continue;
 						}
 					}
-					// [1406] set the return type
+					// [1487] set the return type
 					switch ($help->type)
 					{
-						// [1409] set joomla article
+						// [1490] set joomla article
 						case 1:
 							return self::loadArticleLink($help->article);
 						break;
-						// [1413] set help text
+						// [1494] set help text
 						case 2:
 							return self::loadHelpTextLink($help->id);
 						break;
-						// [1417] set Link
+						// [1498] set Link
 						case 3:
 							return $help->url;
 						break;
@@ -977,7 +977,7 @@ abstract class CostbenefitprojectionHelper
 	{
 		if (strpos($content,'class="uk-') !== false)
 		{
-			// [2645] reset
+			// [2726] reset
 			$temp = array();
 			foreach (self::$uk_components as $looking => $add)
 			{
@@ -986,15 +986,15 @@ abstract class CostbenefitprojectionHelper
 					$temp[] = $looking;
 				}
 			}
-			// [2654] make sure uikit is loaded to config
+			// [2735] make sure uikit is loaded to config
 			if (strpos($content,'class="uk-') !== false)
 			{
 				self::$uikit = true;
 			}
-			// [2659] sorter
+			// [2740] sorter
 			if (self::checkArray($temp))
 			{
-				// [2662] merger
+				// [2743] merger
 				if (self::checkArray($classes))
 				{
 					$newTemp = array_merge($temp,$classes);
@@ -1015,33 +1015,33 @@ abstract class CostbenefitprojectionHelper
 	*/
 	public static function createUser($new)
 	{
-		// [1635] load the user component language files if there is an error.
+		// [1716] load the user component language files if there is an error.
 		$lang = JFactory::getLanguage();
 		$extension = 'com_users';
 		$base_dir = JPATH_SITE;
 		$language_tag = 'en-GB';
 		$reload = true;
 		$lang->load($extension, $base_dir, $language_tag, $reload);
-		// [1642] load the user regestration model
+		// [1723] load the user regestration model
 		$model = self::getModel('registration', JPATH_ROOT. '/components/com_users', 'Users');
-		// [1644] make sure no activation is needed
+		// [1725] make sure no activation is needed
 		$useractivation = self::setParams('com_users','useractivation',0);
-		// [1646] make sure password is send
+		// [1727] make sure password is send
 		$sendpassword = self::setParams('com_users','sendpassword',1);
-		// [1648] Check if password was set
+		// [1729] Check if password was set
 		if (isset($new['password']) && isset($new['password2']) && self::checkString($new['password']) && self::checkString($new['password2']))
 		{
-			// [1651] Use the users passwords
+			// [1732] Use the users passwords
 			$password = $new['password'];
 			$password2 = $new['password2'];
 		}
 		else
 		{
-			// [1657] Set random password
+			// [1738] Set random password
 			$password = self::randomkey(8);
 			$password2 = $password;
 		}
-		// [1661] set username
+		// [1742] set username
 		if (isset($new['username']) && self::checkString($new['username']))
 		{
 			$new['username'] = self::safeString($new['username']);
@@ -1050,7 +1050,7 @@ abstract class CostbenefitprojectionHelper
 		{
 			$new['username'] = self::safeString($new['name']);			
 		}
-		// [1670] linup new user data
+		// [1751] linup new user data
 		$data = array(
 			'username' => $new['username'],
 			'name' => $new['name'],
@@ -1058,13 +1058,13 @@ abstract class CostbenefitprojectionHelper
 			'password1' => $password, // First password field
 			'password2' => $password2, // Confirm password field
 			'block' => 0 );
-		// [1678] register the new user
+		// [1759] register the new user
 		$userId = $model->register($data);
-		// [1680] set activation back to default
+		// [1761] set activation back to default
 		self::setParams('com_users','useractivation',$useractivation);
-		// [1682] set send password back to default
+		// [1763] set send password back to default
 		self::setParams('com_users','sendpassword',$sendpassword);
-		// [1684] if user is created
+		// [1765] if user is created
 		if ($userId > 0)
 		{
 			return $userId;
@@ -1074,21 +1074,21 @@ abstract class CostbenefitprojectionHelper
 
 	protected static function setParams($component,$target,$value)
 	{
-		// [1694] Get the params and set the new values
+		// [1775] Get the params and set the new values
 		$params = JComponentHelper::getParams($component);
 		$was = $params->get($target, null);
 		if ($was != $value)
 		{
 			$params->set($target, $value);
-			// [1700] Get a new database query instance
+			// [1781] Get a new database query instance
 			$db = JFactory::getDBO();
 			$query = $db->getQuery(true);
-			// [1703] Build the query
+			// [1784] Build the query
 			$query->update('#__extensions AS a');
 			$query->set('a.params = ' . $db->quote((string)$params));
 			$query->where('a.element = ' . $db->quote((string)$component));
 			
-			// [1708] Execute the query
+			// [1789] Execute the query
 			$db->setQuery($query);
 			$db->query();
 		}
@@ -1646,12 +1646,12 @@ abstract class CostbenefitprojectionHelper
 	{
 		if ('advanced' == $type)
 		{
-			// [1287] Get the global params
+			// [1289] Get the global params
 			$params = JComponentHelper::getParams('com_costbenefitprojection', true);
 			$advanced_key = $params->get('advanced_key', null);
 			if ($advanced_key)
 			{
-				// [1292] load the file
+				// [1294] load the file
 				JLoader::import( 'vdm', JPATH_COMPONENT_ADMINISTRATOR);
 
 				$the = new VDM($advanced_key);
diff --git a/site/helpers/headercheck.php b/site/helpers/headercheck.php
index 7552c66a..ac59dd2d 100644
--- a/site/helpers/headercheck.php
+++ b/site/helpers/headercheck.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		headercheck.php
diff --git a/site/helpers/route.php b/site/helpers/route.php
index bc848d07..b050f672 100644
--- a/site/helpers/route.php
+++ b/site/helpers/route.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		route.php
@@ -38,18 +38,18 @@ abstract class CostbenefitprojectionHelperRoute
 	{
 		if ($id > 0)
 		{
-			// [4661] Initialize the needel array.
+			// [4825] Initialize the needel array.
 			$needles = array(
 				'cpanel'  => array((int) $id)
 			);
-			// [4665] Create the link
+			// [4829] Create the link
 			$link = 'index.php?option=com_costbenefitprojection&view=cpanel&id='. $id;
 		}
 		else
 		{
-			// [4670] Initialize the needel array.
+			// [4834] Initialize the needel array.
 			$needles = array();
-			// [4672]Create the link but don't add the id.
+			// [4836]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)
 		{
-			// [4661] Initialize the needel array.
+			// [4825] Initialize the needel array.
 			$needles = array(
 				'publicresults'  => array((int) $id)
 			);
-			// [4665] Create the link
+			// [4829] Create the link
 			$link = 'index.php?option=com_costbenefitprojection&view=publicresults&id='. $id;
 		}
 		else
 		{
-			// [4670] Initialize the needel array.
+			// [4834] Initialize the needel array.
 			$needles = array();
-			// [4672]Create the link but don't add the id.
+			// [4836]Create the link but don't add the id.
 			$link = 'index.php?option=com_costbenefitprojection&view=publicresults';
 		}
 		if ($catid > 1)
@@ -120,18 +120,18 @@ abstract class CostbenefitprojectionHelperRoute
 	{
 		if ($id > 0)
 		{
-			// [4661] Initialize the needel array.
+			// [4825] Initialize the needel array.
 			$needles = array(
 				'createaccount'  => array((int) $id)
 			);
-			// [4665] Create the link
+			// [4829] Create the link
 			$link = 'index.php?option=com_costbenefitprojection&view=createaccount&id='. $id;
 		}
 		else
 		{
-			// [4670] Initialize the needel array.
+			// [4834] Initialize the needel array.
 			$needles = array();
-			// [4672]Create the link but don't add the id.
+			// [4836]Create the link but don't add the id.
 			$link = 'index.php?option=com_costbenefitprojection&view=createaccount';
 		}
 		if ($catid > 1)
@@ -161,18 +161,18 @@ abstract class CostbenefitprojectionHelperRoute
 	{
 		if ($id > 0)
 		{
-			// [4661] Initialize the needel array.
+			// [4825] Initialize the needel array.
 			$needles = array(
 				'companyresults'  => array((int) $id)
 			);
-			// [4665] Create the link
+			// [4829] Create the link
 			$link = 'index.php?option=com_costbenefitprojection&view=companyresults&id='. $id;
 		}
 		else
 		{
-			// [4670] Initialize the needel array.
+			// [4834] Initialize the needel array.
 			$needles = array();
-			// [4672]Create the link but don't add the id.
+			// [4836]Create the link but don't add the id.
 			$link = 'index.php?option=com_costbenefitprojection&view=companyresults';
 		}
 		if ($catid > 1)
@@ -202,18 +202,18 @@ abstract class CostbenefitprojectionHelperRoute
 	{
 		if ($id > 0)
 		{
-			// [4661] Initialize the needel array.
+			// [4825] Initialize the needel array.
 			$needles = array(
 				'combinedresults'  => array((int) $id)
 			);
-			// [4665] Create the link
+			// [4829] Create the link
 			$link = 'index.php?option=com_costbenefitprojection&view=combinedresults&id='. $id;
 		}
 		else
 		{
-			// [4670] Initialize the needel array.
+			// [4834] Initialize the needel array.
 			$needles = array();
-			// [4672]Create the link but don't add the id.
+			// [4836]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 00a86bfd..897d0771 100644
--- a/site/layouts/appnotice.php
+++ b/site/layouts/appnotice.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		appnotice.php
diff --git a/site/layouts/company/age_groups_percentages_fullwidth.php b/site/layouts/company/age_groups_percentages_fullwidth.php
index ebcf0047..966ac20e 100644
--- a/site/layouts/company/age_groups_percentages_fullwidth.php
+++ b/site/layouts/company/age_groups_percentages_fullwidth.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		age_groups_percentages_fullwidth.php
diff --git a/site/layouts/company/age_groups_percentages_left.php b/site/layouts/company/age_groups_percentages_left.php
index de7b07cd..0c248382 100644
--- a/site/layouts/company/age_groups_percentages_left.php
+++ b/site/layouts/company/age_groups_percentages_left.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		age_groups_percentages_left.php
diff --git a/site/layouts/company/age_groups_percentages_right.php b/site/layouts/company/age_groups_percentages_right.php
index 7be2384a..b19328ff 100644
--- a/site/layouts/company/age_groups_percentages_right.php
+++ b/site/layouts/company/age_groups_percentages_right.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		age_groups_percentages_right.php
diff --git a/site/layouts/company/causerisk_selection_fullwidth.php b/site/layouts/company/causerisk_selection_fullwidth.php
index c769aab4..e0de8078 100644
--- a/site/layouts/company/causerisk_selection_fullwidth.php
+++ b/site/layouts/company/causerisk_selection_fullwidth.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		causerisk_selection_fullwidth.php
diff --git a/site/layouts/company/details_above.php b/site/layouts/company/details_above.php
index 894791a5..4f071e00 100644
--- a/site/layouts/company/details_above.php
+++ b/site/layouts/company/details_above.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_above.php
diff --git a/site/layouts/company/details_left.php b/site/layouts/company/details_left.php
index 4bad9c32..591165be 100644
--- a/site/layouts/company/details_left.php
+++ b/site/layouts/company/details_left.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_left.php
diff --git a/site/layouts/company/details_right.php b/site/layouts/company/details_right.php
index 649c6417..b4878afb 100644
--- a/site/layouts/company/details_right.php
+++ b/site/layouts/company/details_right.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_right.php
diff --git a/site/layouts/company/details_under.php b/site/layouts/company/details_under.php
index 9daaa12e..f3cff850 100644
--- a/site/layouts/company/details_under.php
+++ b/site/layouts/company/details_under.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_under.php
diff --git a/site/layouts/company/interventions_fullwidth.php b/site/layouts/company/interventions_fullwidth.php
index c716c009..24515982 100644
--- a/site/layouts/company/interventions_fullwidth.php
+++ b/site/layouts/company/interventions_fullwidth.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		interventions_fullwidth.php
@@ -22,7 +22,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items	= $displayData->ynainterventions;
+$items	= $displayData->wrkinterventions;
 $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 e4577560..75137788 100644
--- a/site/layouts/company/publishing.php
+++ b/site/layouts/company/publishing.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publishing.php
diff --git a/site/layouts/company/publlshing.php b/site/layouts/company/publlshing.php
index 8108d8a0..0726570d 100644
--- a/site/layouts/company/publlshing.php
+++ b/site/layouts/company/publlshing.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publlshing.php
diff --git a/site/layouts/company/scaling_factors_fullwidth.php b/site/layouts/company/scaling_factors_fullwidth.php
index 6f1f6e8d..348def2d 100644
--- a/site/layouts/company/scaling_factors_fullwidth.php
+++ b/site/layouts/company/scaling_factors_fullwidth.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		scaling_factors_fullwidth.php
@@ -22,7 +22,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items	= $displayData->bqlscaling_factors;
+$items	= $displayData->rxjscaling_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 b49801ce..332bd73b 100644
--- a/site/layouts/companydetails.php
+++ b/site/layouts/companydetails.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		companydetails.php
diff --git a/site/layouts/intervention/details_above.php b/site/layouts/intervention/details_above.php
index 78274f21..7cdc77f9 100644
--- a/site/layouts/intervention/details_above.php
+++ b/site/layouts/intervention/details_above.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_above.php
diff --git a/site/layouts/intervention/details_fullwidth.php b/site/layouts/intervention/details_fullwidth.php
index 96abd5fc..a638025d 100644
--- a/site/layouts/intervention/details_fullwidth.php
+++ b/site/layouts/intervention/details_fullwidth.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_fullwidth.php
diff --git a/site/layouts/intervention/details_under.php b/site/layouts/intervention/details_under.php
index 9daaa12e..f3cff850 100644
--- a/site/layouts/intervention/details_under.php
+++ b/site/layouts/intervention/details_under.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_under.php
diff --git a/site/layouts/intervention/publishing.php b/site/layouts/intervention/publishing.php
index e4577560..75137788 100644
--- a/site/layouts/intervention/publishing.php
+++ b/site/layouts/intervention/publishing.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publishing.php
diff --git a/site/layouts/intervention/publlshing.php b/site/layouts/intervention/publlshing.php
index 594ce137..61a60321 100644
--- a/site/layouts/intervention/publlshing.php
+++ b/site/layouts/intervention/publlshing.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publlshing.php
diff --git a/site/layouts/intervention/settings_fullwidth.php b/site/layouts/intervention/settings_fullwidth.php
index bf450880..8382427a 100644
--- a/site/layouts/intervention/settings_fullwidth.php
+++ b/site/layouts/intervention/settings_fullwidth.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		settings_fullwidth.php
diff --git a/site/layouts/intervention/settings_left.php b/site/layouts/intervention/settings_left.php
index 8288c8d5..2d06610a 100644
--- a/site/layouts/intervention/settings_left.php
+++ b/site/layouts/intervention/settings_left.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		settings_left.php
diff --git a/site/layouts/scaling_factor/details_above.php b/site/layouts/scaling_factor/details_above.php
index db87a5a0..1f2642e5 100644
--- a/site/layouts/scaling_factor/details_above.php
+++ b/site/layouts/scaling_factor/details_above.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_above.php
diff --git a/site/layouts/scaling_factor/details_left.php b/site/layouts/scaling_factor/details_left.php
index 733f26e7..29378dbb 100644
--- a/site/layouts/scaling_factor/details_left.php
+++ b/site/layouts/scaling_factor/details_left.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_left.php
diff --git a/site/layouts/scaling_factor/details_right.php b/site/layouts/scaling_factor/details_right.php
index 65b0120b..76ed7236 100644
--- a/site/layouts/scaling_factor/details_right.php
+++ b/site/layouts/scaling_factor/details_right.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_right.php
diff --git a/site/layouts/scaling_factor/publishing.php b/site/layouts/scaling_factor/publishing.php
index e4577560..75137788 100644
--- a/site/layouts/scaling_factor/publishing.php
+++ b/site/layouts/scaling_factor/publishing.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publishing.php
diff --git a/site/layouts/scaling_factor/publlshing.php b/site/layouts/scaling_factor/publlshing.php
index 594ce137..61a60321 100644
--- a/site/layouts/scaling_factor/publlshing.php
+++ b/site/layouts/scaling_factor/publlshing.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publlshing.php
diff --git a/site/models/ajax.php b/site/models/ajax.php
index 2aef732a..88128115 100644
--- a/site/models/ajax.php
+++ b/site/models/ajax.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		ajax.php
@@ -37,13 +37,13 @@ class CostbenefitprojectionModelAjax extends JModelList
 
 	}
 
-	// [9001] Used in company
+	// [9168] Used in company
 	public function getCalculatedResult($id,$data)
 	{
 		return CostbenefitprojectionHelper::calculate($id,$data);
 	}
 
-	// [9001] Used in intervention
+	// [9168] 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 2402bb42..606bf565 100644
--- a/site/models/combinedresults.php
+++ b/site/models/combinedresults.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		combinedresults.php
@@ -90,32 +90,32 @@ class CostbenefitprojectionModelCombinedresults extends JModelList
 				JFactory::getApplication()->redirect('index.php?option=com_costbenefitprojection&view=cpanel');
 			}
 		} 
-		// [2952] Make sure all records load, since no pagination allowed.
+		// [3033] Make sure all records load, since no pagination allowed.
 		$this->setState('list.limit', 0);
-		// [2954] Get a db connection.
+		// [3035] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2957] Create a new query object.
+		// [3038] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [1820] Get from #__costbenefitprojection_company as a
+		// [1901] Get from #__costbenefitprojection_company as a
 		$query->select($db->quoteName(
 			array('a.id','a.name','a.user','a.department','a.per','a.country','a.serviceprovider','a.datayear','a.working_days','a.total_salary','a.total_healthcare','a.productivity_losses','a.males','a.females','a.medical_turnovers_males','a.medical_turnovers_females','a.sick_leave_males','a.sick_leave_females','a.percentmale','a.percentfemale','a.causesrisks','a.published','a.access'),
 			array('id','name','user','department','per','country','serviceprovider','datayear','working_days','total_salary','total_healthcare','productivity_losses','males','females','medical_turnovers_males','medical_turnovers_females','sick_leave_males','sick_leave_females','percentmale','percentfemale','causesrisks','published','access')));
 		$query->from($db->quoteName('#__costbenefitprojection_company', 'a'));
 
-		// [1820] Get from #__costbenefitprojection_country as e
+		// [1901] Get from #__costbenefitprojection_country as e
 		$query->select($db->quoteName(
 			array('e.id','e.name','e.alias','e.user','e.currency','e.datayear','e.worldzone','e.codethree','e.codetwo','e.working_days','e.presenteeism','e.medical_turnovers','e.sick_leave','e.healthcare','e.productivity_losses','e.publicname','e.publicemail','e.publicnumber','e.publicaddress','e.percentmale','e.percentfemale','e.causesrisks','e.maledeath','e.femaledeath','e.maleyld','e.femaleyld','e.access'),
 			array('country_id','country_name','country_alias','country_user','country_currency','country_datayear','country_worldzone','country_codethree','country_codetwo','country_working_days','country_presenteeism','country_medical_turnovers','country_sick_leave','country_healthcare','country_productivity_losses','country_publicname','country_publicemail','country_publicnumber','country_publicaddress','country_percentmale','country_percentfemale','country_causesrisks','country_maledeath','country_femaledeath','country_maleyld','country_femaleyld','country_access')));
 		$query->join('LEFT', ($db->quoteName('#__costbenefitprojection_country', 'e')) . ' ON (' . $db->quoteName('a.country') . ' = ' . $db->quoteName('e.id') . ')');
 
-		// [1820] Get from #__costbenefitprojection_currency as f
+		// [1901] Get from #__costbenefitprojection_currency as f
 		$query->select($db->quoteName(
 			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') . ')');
-		// [2152] Check if $ids is an array with values.
+		// [2233] 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;
 		}
 
-		// [2970] return the query object
+		// [3051] return the query object
 		return $query;
 	}
 
@@ -152,89 +152,89 @@ class CostbenefitprojectionModelCombinedresults extends JModelList
 		// Get the global params
 		$globalParams = JComponentHelper::getParams('com_costbenefitprojection', true);
 
-		// [3059] Get the advanced encription.
+		// [3140] Get the advanced encription.
 		$advancedkey = CostbenefitprojectionHelper::getCryptKey('advanced');
-		// [3061] Get the encription object.
+		// [3142] Get the encription object.
 		$advanced = new FOFEncryptAes($advancedkey, 256);
 
-		// [2985] Convert the parameter fields into objects.
+		// [3066] Convert the parameter fields into objects.
 		foreach ($items as $nr => &$item)
 		{
-			// [2988] Always create a slug for sef URL's
+			// [3069] 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)))
 			{
-				// [2022] Decode medical_turnovers_males
+				// [2103] 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)))
 			{
-				// [2022] Decode sick_leave_males
+				// [2103] 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)))
 			{
-				// [2022] Decode males
+				// [2103] Decode males
 				$item->males = rtrim($advanced->decryptString($item->males), "\0");
 			}
 			if (CostbenefitprojectionHelper::checkString($item->causesrisks))
 			{
-				// [2022] Decode causesrisks
+				// [2103] 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)))
 			{
-				// [2022] Decode females
+				// [2103] 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)))
 			{
-				// [2022] Decode medical_turnovers_females
+				// [2103] 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)))
 			{
-				// [2022] Decode sick_leave_females
+				// [2103] 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)))
 			{
-				// [2022] Decode total_salary
+				// [2103] 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)))
 			{
-				// [2022] Decode total_healthcare
+				// [2103] Decode total_healthcare
 				$item->total_healthcare = rtrim($advanced->decryptString($item->total_healthcare), "\0");
 			}
 			if (CostbenefitprojectionHelper::checkString($item->country_causesrisks))
 			{
-				// [2022] Decode country_causesrisks
+				// [2103] Decode country_causesrisks
 				$item->country_causesrisks = json_decode($item->country_causesrisks, true);
 			}
-			// [2037] Make sure the content prepare plugins fire on country_publicaddress.
+			// [2118] Make sure the content prepare plugins fire on country_publicaddress.
 			$item->country_publicaddress = JHtml::_('content.prepare',$item->country_publicaddress);
-			// [2039] Checking if country_publicaddress has uikit components that must be loaded.
+			// [2120] Checking if country_publicaddress has uikit components that must be loaded.
 			$this->uikitComp = CostbenefitprojectionHelper::getUikitComp($item->country_publicaddress,$this->uikitComp);
-			// [2342] set the global causesrisks value.
+			// [2423] set the global causesrisks value.
 			$this->a_causesrisks = $item->causesrisks;
-			// [2342] set the global datayear value.
+			// [2423] set the global datayear value.
 			$this->a_datayear = $item->datayear;
-			// [2342] set the global datayear value.
+			// [2423] set the global datayear value.
 			$this->e_datayear = $item->country_datayear;
-			// [2342] set the global causesrisks value.
+			// [2423] set the global causesrisks value.
 			$this->e_causesrisks = $item->country_causesrisks;
-			// [2070] set countryCountryHealth_dataB to the $item object.
+			// [2151] set countryCountryHealth_dataB to the $item object.
 			$item->countryCountryHealth_dataB = $this->getCountryCountryHealth_dataBcbb_B($item->country);
-			// [2070] set idCompanyScaling_factorC to the $item object.
+			// [2151] set idCompanyScaling_factorC to the $item object.
 			$item->idCompanyScaling_factorC = $this->getIdCompanyScaling_factorBcbb_C($item->id);
-			// [2070] set idCompanyInterventionD to the $item object.
+			// [2151] set idCompanyInterventionD to the $item object.
 			$item->idCompanyInterventionD = $this->getIdCompanyInterventionBcbb_D($item->id);
-			// [2070] set causesrisksIdCauseriskG to the $item object.
+			// [2151] set causesrisksIdCauseriskG to the $item object.
 			$item->causesrisksIdCauseriskG = $this->getCausesrisksIdCauseriskBcbb_G($item->causesrisks);
-			// [2070] set countryCountryHealth_dataBB to the $item object.
+			// [2151] set countryCountryHealth_dataBB to the $item object.
 			$item->countryCountryHealth_dataBB = $this->getCountryCountryHealth_dataBcbb_BB($item->country);
-			// [2070] set causesrisksIdCauseriskGG to the $item object.
+			// [2151] 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)
 	{
-		// [2750] Get a db connection.
+		// [2831] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2752] Create a new query object.
+		// [2833] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2754] Get from #__costbenefitprojection_health_data as b
+		// [2835] 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));
-		// [2152] Check if $this->a_causesrisks is an array with values.
+		// [2233] 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');
 
-		// [2808] Reset the query using our newly populated query object.
+		// [2889] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2811] check if there was data returned
+		// [2892] 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)
 	{
-		// [2750] Get a db connection.
+		// [2831] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2752] Create a new query object.
+		// [2833] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2754] Get from #__costbenefitprojection_scaling_factor as c
+		// [2835] 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');
 
-		// [2808] Reset the query using our newly populated query object.
+		// [2889] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2811] check if there was data returned
+		// [2892] check if there was data returned
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [2864] Convert the parameter fields into objects.
+			// [2945] Convert the parameter fields into objects.
 			foreach ($items as $nr => &$item)
 			{
-				// [2037] Make sure the content prepare plugins fire on reference.
+				// [2118] Make sure the content prepare plugins fire on reference.
 				$item->reference = JHtml::_('content.prepare',$item->reference);
-				// [2039] Checking if reference has uikit components that must be loaded.
+				// [2120] 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)
 	{
-		// [2750] Get a db connection.
+		// [2831] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2752] Create a new query object.
+		// [2833] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2754] Get from #__costbenefitprojection_intervention as d
+		// [2835] 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');
 
-		// [2808] Reset the query using our newly populated query object.
+		// [2889] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2811] check if there was data returned
+		// [2892] check if there was data returned
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [2864] Convert the parameter fields into objects.
+			// [2945] Convert the parameter fields into objects.
 			foreach ($items as $nr => &$item)
 			{
-				// [2037] Make sure the content prepare plugins fire on description.
+				// [2118] Make sure the content prepare plugins fire on description.
 				$item->description = JHtml::_('content.prepare',$item->description);
-				// [2039] Checking if description has uikit components that must be loaded.
+				// [2120] Checking if description has uikit components that must be loaded.
 				$this->uikitComp = CostbenefitprojectionHelper::getUikitComp($item->description,$this->uikitComp);
-				// [2037] Make sure the content prepare plugins fire on reference.
+				// [2118] Make sure the content prepare plugins fire on reference.
 				$item->reference = JHtml::_('content.prepare',$item->reference);
-				// [2039] Checking if reference has uikit components that must be loaded.
+				// [2120] 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)
 	{
-		// [2750] Get a db connection.
+		// [2831] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2752] Create a new query object.
+		// [2833] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2754] Get from #__costbenefitprojection_causerisk as g
+		// [2835] 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'));
 
-		// [2760] Check if $causesrisks is an array with values.
+		// [2841] 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;
 		}
 
-		// [2808] Reset the query using our newly populated query object.
+		// [2889] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2811] check if there was data returned
+		// [2892] check if there was data returned
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [2864] Convert the parameter fields into objects.
+			// [2945] Convert the parameter fields into objects.
 			foreach ($items as $nr => &$item)
 			{
-				// [2037] Make sure the content prepare plugins fire on description.
+				// [2118] Make sure the content prepare plugins fire on description.
 				$item->description = JHtml::_('content.prepare',$item->description);
-				// [2039] Checking if description has uikit components that must be loaded.
+				// [2120] 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)
 	{
-		// [2750] Get a db connection.
+		// [2831] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2752] Create a new query object.
+		// [2833] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2754] Get from #__costbenefitprojection_health_data as bb
+		// [2835] 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));
-		// [2152] Check if $this->e_causesrisks is an array with values.
+		// [2233] 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');
 
-		// [2808] Reset the query using our newly populated query object.
+		// [2889] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2811] check if there was data returned
+		// [2892] 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)
 	{
-		// [2750] Get a db connection.
+		// [2831] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2752] Create a new query object.
+		// [2833] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2754] Get from #__costbenefitprojection_causerisk as gg
+		// [2835] 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'));
 
-		// [2760] Check if $causesrisks is an array with values.
+		// [2841] 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;
 		}
 
-		// [2808] Reset the query using our newly populated query object.
+		// [2889] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2811] check if there was data returned
+		// [2892] check if there was data returned
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [2864] Convert the parameter fields into objects.
+			// [2945] Convert the parameter fields into objects.
 			foreach ($items as $nr => &$item)
 			{
-				// [2037] Make sure the content prepare plugins fire on description.
+				// [2118] Make sure the content prepare plugins fire on description.
 				$item->description = JHtml::_('content.prepare',$item->description);
-				// [2039] Checking if description has uikit components that must be loaded.
+				// [2120] 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 ad0f4a6d..ba8972c0 100644
--- a/site/models/company.php
+++ b/site/models/company.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		company.php
@@ -91,60 +91,60 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 
 			if (!empty($item->causesrisks))
 			{
-				// [4059] JSON Decode causesrisks.
+				// [4223] JSON Decode causesrisks.
 				$item->causesrisks = json_decode($item->causesrisks);
 			}
 
-			// [4101] Get the advanced encription key.
+			// [4265] Get the advanced encription key.
 			$advancedkey = CostbenefitprojectionHelper::getCryptKey('advanced');
-			// [4103] Get the encription object.
+			// [4267] 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)))
 			{
-				// [4109] advanced decript data medical_turnovers_males.
+				// [4273] 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)))
 			{
-				// [4109] advanced decript data sick_leave_males.
+				// [4273] 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)))
 			{
-				// [4109] advanced decript data males.
+				// [4273] 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)))
 			{
-				// [4109] advanced decript data females.
+				// [4273] 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)))
 			{
-				// [4109] advanced decript data medical_turnovers_females.
+				// [4273] 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)))
 			{
-				// [4109] advanced decript data sick_leave_females.
+				// [4273] 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)))
 			{
-				// [4109] advanced decript data total_salary.
+				// [4273] 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)))
 			{
-				// [4109] advanced decript data total_healthcare.
+				// [4273] 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->companydohg = $item->id;
-		$this->companyxiit = $item->id;
+		$this->companyfjsy = $item->id;
+		$this->companyzyqu = $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 getBqlscaling_factors()
+	public function getRxjscaling_factors()
 	{
-		// [7030] Get the user object.
+		// [7197] Get the user object.
 		$user = JFactory::getUser();
-		// [7032] Create a new query object.
+		// [7199] Create a new query object.
 		$db = JFactory::getDBO();
 		$query = $db->getQuery(true);
 
-		// [7035] Select some fields
+		// [7202] Select some fields
 		$query->select('a.*');
 
-		// [7042] From the costbenefitprojection_scaling_factor table
+		// [7209] 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
 			}
 		}
 
-		// [7635] From the costbenefitprojection_causerisk table.
+		// [7802] 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') . ')');
 
-		// [7635] From the costbenefitprojection_company table.
+		// [7802] 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') . ')');
 
-		// [7058] Filter by companydohg global.
-		$companydohg = $this->companydohg;
-		if (is_numeric($companydohg ))
+		// [7225] Filter by companyfjsy global.
+		$companyfjsy = $this->companyfjsy;
+		if (is_numeric($companyfjsy ))
 		{
-			$query->where('a.company = ' . (int) $companydohg );
+			$query->where('a.company = ' . (int) $companyfjsy );
 		}
-		elseif (is_string($companydohg))
+		elseif (is_string($companyfjsy))
 		{
-			$query->where('a.company = ' . $db->quote($companydohg));
+			$query->where('a.company = ' . $db->quote($companyfjsy));
 		}
 		else
 		{
 			$query->where('a.company = -5');
 		}
 
-		// [7090] Order the results by ordering
+		// [7257] Order the results by ordering
 		$query->order('a.ordering  ASC');
 
-		// [7092] Load the items
+		// [7259] Load the items
 		$db->setQuery($query);
 		$db->execute();
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [10696] set values to display correctly.
+			// [10867] set values to display correctly.
 			if (CostbenefitprojectionHelper::checkArray($items))
 			{
-				// [10699] get user object.
+				// [10870] 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 getYnainterventions()
+	public function getWrkinterventions()
 	{
-		// [7030] Get the user object.
+		// [7197] Get the user object.
 		$user = JFactory::getUser();
-		// [7032] Create a new query object.
+		// [7199] Create a new query object.
 		$db = JFactory::getDBO();
 		$query = $db->getQuery(true);
 
-		// [7035] Select some fields
+		// [7202] Select some fields
 		$query->select('a.*');
 
-		// [7042] From the costbenefitprojection_intervention table
+		// [7209] 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
 			}
 		}
 
-		// [7635] From the costbenefitprojection_company table.
+		// [7802] 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') . ')');
 
-		// [7058] Filter by companyxiit global.
-		$companyxiit = $this->companyxiit;
-		if (is_numeric($companyxiit ))
+		// [7225] Filter by companyzyqu global.
+		$companyzyqu = $this->companyzyqu;
+		if (is_numeric($companyzyqu ))
 		{
-			$query->where('a.company = ' . (int) $companyxiit );
+			$query->where('a.company = ' . (int) $companyzyqu );
 		}
-		elseif (is_string($companyxiit))
+		elseif (is_string($companyzyqu))
 		{
-			$query->where('a.company = ' . $db->quote($companyxiit));
+			$query->where('a.company = ' . $db->quote($companyzyqu));
 		}
 		else
 		{
 			$query->where('a.company = -5');
 		}
 
-		// [7090] Order the results by ordering
+		// [7257] Order the results by ordering
 		$query->order('a.ordering  ASC');
 
-		// [7092] Load the items
+		// [7259] Load the items
 		$db->setQuery($query);
 		$db->execute();
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [10696] set values to display correctly.
+			// [10867] set values to display correctly.
 			if (CostbenefitprojectionHelper::checkArray($items))
 			{
-				// [10699] get user object.
+				// [10870] get user object.
 				$user = JFactory::getUser();
 				foreach ($items as $nr => &$item)
 				{
@@ -345,13 +345,13 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 			}
 		} 
 
-			// [10962] set selection value to a translatable value
+			// [11133] set selection value to a translatable value
 			if (CostbenefitprojectionHelper::checkArray($items))
 			{
 				foreach ($items as $nr => &$item)
 				{
-					// [10969] convert type
-					$item->type = $this->selectionTranslationYnainterventions($item->type, 'type');
+					// [11140] convert type
+					$item->type = $this->selectionTranslationWrkinterventions($item->type, 'type');
 				}
 			}
 
@@ -365,16 +365,16 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 	*
 	* @return translatable string
 	*/
-	public function selectionTranslationYnainterventions($value,$name)
+	public function selectionTranslationWrkinterventions($value,$name)
 	{
-		// [10995] Array of type language strings
+		// [11166] Array of type language strings
 		if ($name == 'type')
 		{
 			$typeArray = array(
 				1 => 'COM_COSTBENEFITPROJECTION_INTERVENTION_SINGLE',
 				2 => 'COM_COSTBENEFITPROJECTION_INTERVENTION_CLUSTER'
 			);
-			// [11026] Now check if value is found in this array
+			// [11197] 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)
-	{		// [9651] Get the form.
+	{		// [9818] 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;
 
-		// [9736] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first.
+		// [9903] 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');
 		}
-		// [9741] The back end uses id so we use that the rest of the time and set it to 0 by default.
+		// [9908] 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();
 
-		// [9747] Check for existing item.
-		// [9748] Modify the form based on Edit State access controls.
+		// [9914] Check for existing item.
+		// [9915] 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')))
 		{
-			// [9761] Disable fields for display.
+			// [9928] Disable fields for display.
 			$form->setFieldAttribute('ordering', 'disabled', 'true');
 			$form->setFieldAttribute('published', 'disabled', 'true');
-			// [9764] Disable fields while saving.
+			// [9931] Disable fields while saving.
 			$form->setFieldAttribute('ordering', 'filter', 'unset');
 			$form->setFieldAttribute('published', 'filter', 'unset');
 		}
-		// [9769] Modify the form based on Edit Creaded By access controls.
+		// [9936] 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')))
 		{
-			// [9781] Disable fields for display.
+			// [9948] Disable fields for display.
 			$form->setFieldAttribute('created_by', 'disabled', 'true');
-			// [9783] Disable fields for display.
+			// [9950] Disable fields for display.
 			$form->setFieldAttribute('created_by', 'readonly', 'true');
-			// [9785] Disable fields while saving.
+			// [9952] Disable fields while saving.
 			$form->setFieldAttribute('created_by', 'filter', 'unset');
 		}
-		// [9788] Modify the form based on Edit Creaded Date access controls.
+		// [9955] 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')))
 		{
-			// [9800] Disable fields for display.
+			// [9967] Disable fields for display.
 			$form->setFieldAttribute('created', 'disabled', 'true');
-			// [9802] Disable fields while saving.
+			// [9969] Disable fields while saving.
 			$form->setFieldAttribute('created', 'filter', 'unset');
 		}
-		// [9810] Modify the form based on Edit Email access controls.
+		// [9977] 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')))
 		{
-			// [9814] Disable fields for display.
+			// [9981] Disable fields for display.
 			$form->setFieldAttribute('email', 'disabled', 'true');
-			// [9816] Disable fields for display.
+			// [9983] Disable fields for display.
 			$form->setFieldAttribute('email', 'readonly', 'true');
 			if (!$form->getValue('email'))
 			{
-				// [9826] Disable fields while saving.
+				// [9993] Disable fields while saving.
 				$form->setFieldAttribute('email', 'filter', 'unset');
-				// [9828] Disable fields while saving.
+				// [9995] Disable fields while saving.
 				$form->setFieldAttribute('email', 'required', 'false');
 			}
 		}
-		// [9810] Modify the form based on Edit User access controls.
+		// [9977] 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')))
 		{
-			// [9814] Disable fields for display.
+			// [9981] Disable fields for display.
 			$form->setFieldAttribute('user', 'disabled', 'true');
-			// [9816] Disable fields for display.
+			// [9983] Disable fields for display.
 			$form->setFieldAttribute('user', 'readonly', 'true');
 			if (!$form->getValue('user'))
 			{
-				// [9826] Disable fields while saving.
+				// [9993] Disable fields while saving.
 				$form->setFieldAttribute('user', 'filter', 'unset');
-				// [9828] Disable fields while saving.
+				// [9995] Disable fields while saving.
 				$form->setFieldAttribute('user', 'required', 'false');
 			}
 		}
-		// [9810] Modify the form based on Edit Department access controls.
+		// [9977] 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')))
 		{
-			// [9814] Disable fields for display.
+			// [9981] Disable fields for display.
 			$form->setFieldAttribute('department', 'disabled', 'true');
-			// [9816] Disable fields for display.
+			// [9983] Disable fields for display.
 			$form->setFieldAttribute('department', 'readonly', 'true');
-			// [9820] Disable radio button for display.
+			// [9987] Disable radio button for display.
 			$class = $form->getFieldAttribute('department', 'class', '');
 			$form->setFieldAttribute('department', 'class', $class.' disabled no-click');
 			if (!$form->getValue('department'))
 			{
-				// [9826] Disable fields while saving.
+				// [9993] Disable fields while saving.
 				$form->setFieldAttribute('department', 'filter', 'unset');
-				// [9828] Disable fields while saving.
+				// [9995] Disable fields while saving.
 				$form->setFieldAttribute('department', 'required', 'false');
 			}
 		}
-		// [9810] Modify the form based on Edit Country access controls.
+		// [9977] 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')))
 		{
-			// [9814] Disable fields for display.
+			// [9981] Disable fields for display.
 			$form->setFieldAttribute('country', 'disabled', 'true');
-			// [9816] Disable fields for display.
+			// [9983] Disable fields for display.
 			$form->setFieldAttribute('country', 'readonly', 'true');
 			if (!$form->getValue('country'))
 			{
-				// [9826] Disable fields while saving.
+				// [9993] Disable fields while saving.
 				$form->setFieldAttribute('country', 'filter', 'unset');
-				// [9828] Disable fields while saving.
+				// [9995] Disable fields while saving.
 				$form->setFieldAttribute('country', 'required', 'false');
 			}
 		}
-		// [9810] Modify the form based on Edit Serviceprovider access controls.
+		// [9977] 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')))
 		{
-			// [9814] Disable fields for display.
+			// [9981] Disable fields for display.
 			$form->setFieldAttribute('serviceprovider', 'disabled', 'true');
-			// [9816] Disable fields for display.
+			// [9983] Disable fields for display.
 			$form->setFieldAttribute('serviceprovider', 'readonly', 'true');
 			if (!$form->getValue('serviceprovider'))
 			{
-				// [9826] Disable fields while saving.
+				// [9993] Disable fields while saving.
 				$form->setFieldAttribute('serviceprovider', 'filter', 'unset');
-				// [9828] Disable fields while saving.
+				// [9995] Disable fields while saving.
 				$form->setFieldAttribute('serviceprovider', 'required', 'false');
 			}
 		}
-		// [9810] Modify the form based on Edit Per access controls.
+		// [9977] 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')))
 		{
-			// [9814] Disable fields for display.
+			// [9981] Disable fields for display.
 			$form->setFieldAttribute('per', 'disabled', 'true');
-			// [9816] Disable fields for display.
+			// [9983] Disable fields for display.
 			$form->setFieldAttribute('per', 'readonly', 'true');
-			// [9820] Disable radio button for display.
+			// [9987] Disable radio button for display.
 			$class = $form->getFieldAttribute('per', 'class', '');
 			$form->setFieldAttribute('per', 'class', $class.' disabled no-click');
 			if (!$form->getValue('per'))
 			{
-				// [9826] Disable fields while saving.
+				// [9993] Disable fields while saving.
 				$form->setFieldAttribute('per', 'filter', 'unset');
-				// [9828] Disable fields while saving.
+				// [9995] Disable fields while saving.
 				$form->setFieldAttribute('per', 'required', 'false');
 			}
 		}
-		// [9810] Modify the form based on Edit Causesrisks access controls.
+		// [9977] 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')))
 		{
-			// [9814] Disable fields for display.
+			// [9981] Disable fields for display.
 			$form->setFieldAttribute('causesrisks', 'disabled', 'true');
-			// [9816] Disable fields for display.
+			// [9983] Disable fields for display.
 			$form->setFieldAttribute('causesrisks', 'readonly', 'true');
 			if (!$form->getValue('causesrisks'))
 			{
-				// [9826] Disable fields while saving.
+				// [9993] Disable fields while saving.
 				$form->setFieldAttribute('causesrisks', 'filter', 'unset');
-				// [9828] Disable fields while saving.
+				// [9995] Disable fields while saving.
 				$form->setFieldAttribute('causesrisks', 'required', 'false');
 			}
 		}
-		// [9810] Modify the form based on Edit Percentfemale access controls.
+		// [9977] 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')))
 		{
-			// [9814] Disable fields for display.
+			// [9981] Disable fields for display.
 			$form->setFieldAttribute('percentfemale', 'disabled', 'true');
-			// [9816] Disable fields for display.
+			// [9983] Disable fields for display.
 			$form->setFieldAttribute('percentfemale', 'readonly', 'true');
-			// [9820] Disable radio button for display.
+			// [9987] Disable radio button for display.
 			$class = $form->getFieldAttribute('percentfemale', 'class', '');
 			$form->setFieldAttribute('percentfemale', 'class', $class.' disabled no-click');
 			if (!$form->getValue('percentfemale'))
 			{
-				// [9826] Disable fields while saving.
+				// [9993] Disable fields while saving.
 				$form->setFieldAttribute('percentfemale', 'filter', 'unset');
-				// [9828] Disable fields while saving.
+				// [9995] Disable fields while saving.
 				$form->setFieldAttribute('percentfemale', 'required', 'false');
 			}
 		}
-		// [9810] Modify the form based on Edit Datayear access controls.
+		// [9977] 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')))
 		{
-			// [9814] Disable fields for display.
+			// [9981] Disable fields for display.
 			$form->setFieldAttribute('datayear', 'disabled', 'true');
-			// [9816] Disable fields for display.
+			// [9983] Disable fields for display.
 			$form->setFieldAttribute('datayear', 'readonly', 'true');
 			if (!$form->getValue('datayear'))
 			{
-				// [9826] Disable fields while saving.
+				// [9993] Disable fields while saving.
 				$form->setFieldAttribute('datayear', 'filter', 'unset');
-				// [9828] Disable fields while saving.
+				// [9995] Disable fields while saving.
 				$form->setFieldAttribute('datayear', 'required', 'false');
 			}
 		}
-		// [9810] Modify the form based on Edit Percentmale access controls.
+		// [9977] 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')))
 		{
-			// [9814] Disable fields for display.
+			// [9981] Disable fields for display.
 			$form->setFieldAttribute('percentmale', 'disabled', 'true');
-			// [9816] Disable fields for display.
+			// [9983] Disable fields for display.
 			$form->setFieldAttribute('percentmale', 'readonly', 'true');
-			// [9820] Disable radio button for display.
+			// [9987] Disable radio button for display.
 			$class = $form->getFieldAttribute('percentmale', 'class', '');
 			$form->setFieldAttribute('percentmale', 'class', $class.' disabled no-click');
 			if (!$form->getValue('percentmale'))
 			{
-				// [9826] Disable fields while saving.
+				// [9993] Disable fields while saving.
 				$form->setFieldAttribute('percentmale', 'filter', 'unset');
-				// [9828] Disable fields while saving.
+				// [9995] Disable fields while saving.
 				$form->setFieldAttribute('percentmale', 'required', 'false');
 			}
 		}
@@ -654,7 +654,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 			}
 
 			$user = JFactory::getUser();
-			// [9952] The record has been set. Check the record permissions.
+			// [10119] 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)
 		{
-			// [10039] The record has been set. Check the record permissions.
+			// [10206] 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;
 			}
 		}
-		// [10056] In the absense of better information, revert to the component permissions.
+		// [10223] 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')
 	{
-		// [9864] Check specific edit permission then general edit permission.
+		// [10031] 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)
 	{
-		// [8855] check if the not_required field is set
+		// [9022] 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);
-			// [8860] now change the required field attributes value
+			// [9027] now change the required field attributes value
 			foreach ($requiredFields as $requiredField)
 			{
-				// [8863] make sure there is a string value
+				// [9030] make sure there is a string value
 				if (CostbenefitprojectionHelper::checkString($requiredField))
 				{
-					// [8866] change to false
+					// [9033] change to false
 					$form->setFieldAttribute($requiredField, 'required', 'false');
-					// [8868] also clear the data set
+					// [9035] also clear the data set
 					$data[$requiredField] = '';
 				}
 			}
@@ -957,7 +957,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 	{
 		if (empty($this->batchSet))
 		{
-			// [5015] Set some needed variables.
+			// [5179] 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
 			}
 		}
 
-		// [5035] get list of uniqe fields
+		// [5199] get list of uniqe fields
 		$uniqeFields = $this->getUniqeFields();
-		// [5037] remove move_copy from array
+		// [5201] remove move_copy from array
 		unset($values['move_copy']);
 
-		// [5040] make sure published is set
+		// [5204] make sure published is set
 		if (!isset($values['published']))
 		{
 			$values['published'] = 0;
@@ -1017,21 +1017,21 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 
 		$newIds = array();
 
-		// [5077] Parent exists so let's proceed
+		// [5241] Parent exists so let's proceed
 		while (!empty($pks))
 		{
-			// [5080] Pop the first ID off the stack
+			// [5244] Pop the first ID off the stack
 			$pk = array_shift($pks);
 
 			$this->table->reset();
 
-			// [5085] only allow copy if user may edit this item.
+			// [5249] only allow copy if user may edit this item.
 
 			if (!$this->user->authorise('company.edit', $contexts[$pk]))
 
 			{
 
-				// [5095] Not fatal error
+				// [5259] Not fatal error
 
 				$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 
@@ -1039,19 +1039,19 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 
 			}
 
-			// [5100] Check that the row actually exists
+			// [5264] Check that the row actually exists
 			if (!$this->table->load($pk))
 			{
 				if ($error = $this->table->getError())
 				{
-					// [5105] Fatal error
+					// [5269] Fatal error
 					$this->setError($error);
 
 					return false;
 				}
 				else
 				{
-					// [5112] Not fatal error
+					// [5276] 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);
 
-			// [5148] insert all set values
+			// [5312] insert all set values
 			if (CostbenefitprojectionHelper::checkArray($values))
 			{
 				foreach ($values as $key => $value)
@@ -1071,7 +1071,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 				}
 			}
 
-			// [5160] update all uniqe fields
+			// [5324] update all uniqe fields
 			if (CostbenefitprojectionHelper::checkArray($uniqeFields))
 			{
 				foreach ($uniqeFields as $uniqeField)
@@ -1080,13 +1080,13 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 				}
 			}
 
-			// [5169] Reset the ID because we are making a copy
+			// [5333] Reset the ID because we are making a copy
 			$this->table->id = 0;
 
-			// [5172] TODO: Deal with ordering?
-			// [5173] $this->table->ordering	= 1;
+			// [5336] TODO: Deal with ordering?
+			// [5337] $this->table->ordering	= 1;
 
-			// [5175] Check the row.
+			// [5339] 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);
 			}
 
-			// [5188] Store the row.
+			// [5352] Store the row.
 			if (!$this->table->store())
 			{
 				$this->setError($this->table->getError());
@@ -1107,14 +1107,14 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 				return false;
 			}
 
-			// [5196] Get the new item ID
+			// [5360] Get the new item ID
 			$newId = $this->table->get('id');
 
-			// [5199] Add the new ID to the array
+			// [5363] Add the new ID to the array
 			$newIds[$pk] = $newId;
 		}
 
-		// [5203] Clean the cache
+		// [5367] Clean the cache
 		$this->cleanCache();
 
 		return $newIds;
@@ -1135,7 +1135,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 	{
 		if (empty($this->batchSet))
 		{
-			// [4817] Set some needed variables.
+			// [4981] 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
 			}
 		}
 
-		// [4839] make sure published only updates if user has the permission.
+		// [5003] make sure published only updates if user has the permission.
 		if (isset($values['published']) && !$this->canDo->get('company.edit.state'))
 		{
 			unset($values['published']);
 		}
-		// [4852] remove move_copy from array
+		// [5016] remove move_copy from array
 		unset($values['move_copy']);
 
-		// [4873] Parent exists so we proceed
+		// [5037] 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;
 			}
 
-			// [4890] Check that the row actually exists
+			// [5054] Check that the row actually exists
 			if (!$this->table->load($pk))
 			{
 				if ($error = $this->table->getError())
 				{
-					// [4895] Fatal error
+					// [5059] Fatal error
 					$this->setError($error);
 
 					return false;
 				}
 				else
 				{
-					// [4902] Not fatal error
+					// [5066] Not fatal error
 					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 					continue;
 				}
 			}
 
-			// [4908] insert all set values.
+			// [5072] insert all set values.
 			if (CostbenefitprojectionHelper::checkArray($values))
 			{
 				foreach ($values as $key => $value)
 				{
-					// [4913] Do special action for access.
+					// [5077] Do special action for access.
 					if ('access' == $key && strlen($value) > 0)
 					{
 						$this->table->$key = $value;
@@ -1233,7 +1233,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 			}
 
 
-			// [4925] Check the row.
+			// [5089] 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);
 			}
 
-			// [4938] Store the row.
+			// [5102] Store the row.
 			if (!$this->table->store())
 			{
 				$this->setError($this->table->getError());
@@ -1255,7 +1255,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 			}
 		}
 
-		// [4947] Clean the cache
+		// [5111] Clean the cache
 		$this->cleanCache();
 
 		return true;
@@ -1285,60 +1285,60 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 			$data['metadata'] = (string) $metadata;
 		} 
 
-		// [4169] Set the causesrisks string to JSON string.
+		// [4333] Set the causesrisks string to JSON string.
 		if (isset($data['causesrisks']))
 		{
 			$data['causesrisks'] = (string) json_encode($data['causesrisks']);
 		}
 
-		// [4209] Get the advanced encription key.
+		// [4373] Get the advanced encription key.
 		$advancedkey = CostbenefitprojectionHelper::getCryptKey('advanced');
-		// [4211] Get the encription object
+		// [4375] Get the encription object
 		$advanced = new FOFEncryptAes($advancedkey, 256);
 
-		// [4215] Encript data medical_turnovers_males.
+		// [4379] Encript data medical_turnovers_males.
 		if (isset($data['medical_turnovers_males']) && $advancedkey)
 		{
 			$data['medical_turnovers_males'] = $advanced->encryptString($data['medical_turnovers_males']);
 		}
 
-		// [4215] Encript data sick_leave_males.
+		// [4379] Encript data sick_leave_males.
 		if (isset($data['sick_leave_males']) && $advancedkey)
 		{
 			$data['sick_leave_males'] = $advanced->encryptString($data['sick_leave_males']);
 		}
 
-		// [4215] Encript data males.
+		// [4379] Encript data males.
 		if (isset($data['males']) && $advancedkey)
 		{
 			$data['males'] = $advanced->encryptString($data['males']);
 		}
 
-		// [4215] Encript data females.
+		// [4379] Encript data females.
 		if (isset($data['females']) && $advancedkey)
 		{
 			$data['females'] = $advanced->encryptString($data['females']);
 		}
 
-		// [4215] Encript data medical_turnovers_females.
+		// [4379] Encript data medical_turnovers_females.
 		if (isset($data['medical_turnovers_females']) && $advancedkey)
 		{
 			$data['medical_turnovers_females'] = $advanced->encryptString($data['medical_turnovers_females']);
 		}
 
-		// [4215] Encript data sick_leave_females.
+		// [4379] Encript data sick_leave_females.
 		if (isset($data['sick_leave_females']) && $advancedkey)
 		{
 			$data['sick_leave_females'] = $advanced->encryptString($data['sick_leave_females']);
 		}
 
-		// [4215] Encript data total_salary.
+		// [4379] Encript data total_salary.
 		if (isset($data['total_salary']) && $advancedkey)
 		{
 			$data['total_salary'] = $advanced->encryptString($data['total_salary']);
 		}
 
-		// [4215] Encript data total_healthcare.
+		// [4379] 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;
 		}
 
-		// [5295] Alter the uniqe field for save as copy
+		// [5459] Alter the uniqe field for save as copy
 		if ($input->get('task') == 'save2copy')
 		{
-			// [5298] Automatic handling of other uniqe fields
+			// [5462] 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)
 	{
 
-		// [5353] Alter the title
+		// [5517] 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 4d331838..cc51398d 100644
--- a/site/models/companyresults.php
+++ b/site/models/companyresults.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		companyresults.php
@@ -135,123 +135,123 @@ class CostbenefitprojectionModelCompanyresults extends JModelItem
 			try
 			{
 
-				// [2464] Get the advanced encription.
+				// [2545] Get the advanced encription.
 				$advancedkey = CostbenefitprojectionHelper::getCryptKey('advanced');
-				// [2466] Get the encription object.
+				// [2547] Get the encription object.
 				$advanced = new FOFEncryptAes($advancedkey, 256);
-				// [2370] Get a db connection.
+				// [2451] Get a db connection.
 				$db = JFactory::getDbo();
 
-				// [2372] Create a new query object.
+				// [2453] Create a new query object.
 				$query = $db->getQuery(true);
 
-				// [1820] Get from #__costbenefitprojection_company as a
+				// [1901] Get from #__costbenefitprojection_company as a
 				$query->select($db->quoteName(
 			array('a.id','a.name','a.user','a.department','a.per','a.country','a.serviceprovider','a.datayear','a.working_days','a.total_salary','a.total_healthcare','a.productivity_losses','a.males','a.females','a.medical_turnovers_males','a.medical_turnovers_females','a.sick_leave_males','a.sick_leave_females','a.percentmale','a.percentfemale','a.causesrisks','a.published','a.access'),
 			array('id','name','user','department','per','country','serviceprovider','datayear','working_days','total_salary','total_healthcare','productivity_losses','males','females','medical_turnovers_males','medical_turnovers_females','sick_leave_males','sick_leave_females','percentmale','percentfemale','causesrisks','published','access')));
 				$query->from($db->quoteName('#__costbenefitprojection_company', 'a'));
 
-				// [1820] Get from #__costbenefitprojection_country as e
+				// [1901] Get from #__costbenefitprojection_country as e
 				$query->select($db->quoteName(
 			array('e.id','e.name','e.alias','e.user','e.currency','e.datayear','e.worldzone','e.codethree','e.codetwo','e.working_days','e.presenteeism','e.medical_turnovers','e.sick_leave','e.healthcare','e.productivity_losses','e.publicname','e.publicemail','e.publicnumber','e.publicaddress','e.percentmale','e.percentfemale','e.causesrisks','e.maledeath','e.femaledeath','e.maleyld','e.femaleyld','e.access'),
 			array('country_id','country_name','country_alias','country_user','country_currency','country_datayear','country_worldzone','country_codethree','country_codetwo','country_working_days','country_presenteeism','country_medical_turnovers','country_sick_leave','country_healthcare','country_productivity_losses','country_publicname','country_publicemail','country_publicnumber','country_publicaddress','country_percentmale','country_percentfemale','country_causesrisks','country_maledeath','country_femaledeath','country_maleyld','country_femaleyld','country_access')));
 				$query->join('LEFT', ($db->quoteName('#__costbenefitprojection_country', 'e')) . ' ON (' . $db->quoteName('a.country') . ' = ' . $db->quoteName('e.id') . ')');
 
-				// [1820] Get from #__costbenefitprojection_currency as f
+				// [1901] Get from #__costbenefitprojection_currency as f
 				$query->select($db->quoteName(
 			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') . ')');
 				$query->where('a.id = ' . (int) $pk);
 
-				// [2383] Reset the query using our newly populated query object.
+				// [2464] Reset the query using our newly populated query object.
 				$db->setQuery($query);
-				// [2385] Load the results as a stdClass object.
+				// [2466] Load the results as a stdClass object.
 				$data = $db->loadObject();
 
 				if (empty($data))
 				{
-					// [2396] If no data is found redirect to default page and show warning.
+					// [2477] 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)))
 				{
-					// [2022] Decode medical_turnovers_males
+					// [2103] 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)))
 				{
-					// [2022] Decode sick_leave_males
+					// [2103] 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)))
 				{
-					// [2022] Decode males
+					// [2103] Decode males
 					$data->males = rtrim($advanced->decryptString($data->males), "\0");
 				}
 				if (CostbenefitprojectionHelper::checkString($data->causesrisks))
 				{
-					// [2022] Decode causesrisks
+					// [2103] 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)))
 				{
-					// [2022] Decode females
+					// [2103] 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)))
 				{
-					// [2022] Decode medical_turnovers_females
+					// [2103] 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)))
 				{
-					// [2022] Decode sick_leave_females
+					// [2103] 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)))
 				{
-					// [2022] Decode total_salary
+					// [2103] 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)))
 				{
-					// [2022] Decode total_healthcare
+					// [2103] Decode total_healthcare
 					$data->total_healthcare = rtrim($advanced->decryptString($data->total_healthcare), "\0");
 				}
 				if (CostbenefitprojectionHelper::checkString($data->country_causesrisks))
 				{
-					// [2022] Decode country_causesrisks
+					// [2103] Decode country_causesrisks
 					$data->country_causesrisks = json_decode($data->country_causesrisks, true);
 				}
-				// [2037] Make sure the content prepare plugins fire on country_publicaddress.
+				// [2118] Make sure the content prepare plugins fire on country_publicaddress.
 				$data->country_publicaddress = JHtml::_('content.prepare',$data->country_publicaddress);
-				// [2039] Checking if country_publicaddress has uikit components that must be loaded.
+				// [2120] Checking if country_publicaddress has uikit components that must be loaded.
 				$this->uikitComp = CostbenefitprojectionHelper::getUikitComp($data->country_publicaddress,$this->uikitComp);
-				// [2342] set the global causesrisks value.
+				// [2423] set the global causesrisks value.
 				$this->a_causesrisks = $data->causesrisks;
-				// [2342] set the global datayear value.
+				// [2423] set the global datayear value.
 				$this->a_datayear = $data->datayear;
-				// [2342] set the global datayear value.
+				// [2423] set the global datayear value.
 				$this->e_datayear = $data->country_datayear;
-				// [2342] set the global causesrisks value.
+				// [2423] set the global causesrisks value.
 				$this->e_causesrisks = $data->country_causesrisks;
-				// [2070] set countryCountryHealth_dataB to the $data object.
+				// [2151] set countryCountryHealth_dataB to the $data object.
 				$data->countryCountryHealth_dataB = $this->getCountryCountryHealth_dataEbbe_B($data->country);
-				// [2070] set idCompanyScaling_factorC to the $data object.
+				// [2151] set idCompanyScaling_factorC to the $data object.
 				$data->idCompanyScaling_factorC = $this->getIdCompanyScaling_factorEbbe_C($data->id);
-				// [2070] set idCompanyInterventionD to the $data object.
+				// [2151] set idCompanyInterventionD to the $data object.
 				$data->idCompanyInterventionD = $this->getIdCompanyInterventionEbbe_D($data->id);
-				// [2070] set causesrisksIdCauseriskG to the $data object.
+				// [2151] set causesrisksIdCauseriskG to the $data object.
 				$data->causesrisksIdCauseriskG = $this->getCausesrisksIdCauseriskEbbe_G($data->causesrisks);
-				// [2070] set countryCountryHealth_dataBB to the $data object.
+				// [2151] set countryCountryHealth_dataBB to the $data object.
 				$data->countryCountryHealth_dataBB = $this->getCountryCountryHealth_dataEbbe_BB($data->country);
-				// [2070] set causesrisksIdCauseriskGG to the $data object.
+				// [2151] set causesrisksIdCauseriskGG to the $data object.
 				$data->causesrisksIdCauseriskGG = $this->getCausesrisksIdCauseriskEbbe_GG($data->country_causesrisks);
 
-				// [2490] set data object to item.
+				// [2571] 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)
 	{
-		// [2750] Get a db connection.
+		// [2831] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2752] Create a new query object.
+		// [2833] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2754] Get from #__costbenefitprojection_health_data as b
+		// [2835] 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));
-				// [2152] Check if $this->a_causesrisks is an array with values.
+				// [2233] 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');
 
-		// [2808] Reset the query using our newly populated query object.
+		// [2889] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2811] check if there was data returned
+		// [2892] 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)
 	{
-		// [2750] Get a db connection.
+		// [2831] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2752] Create a new query object.
+		// [2833] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2754] Get from #__costbenefitprojection_scaling_factor as c
+		// [2835] 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');
 
-		// [2808] Reset the query using our newly populated query object.
+		// [2889] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2811] check if there was data returned
+		// [2892] check if there was data returned
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [2864] Convert the parameter fields into objects.
+			// [2945] Convert the parameter fields into objects.
 			foreach ($items as $nr => &$item)
 			{
-				// [2037] Make sure the content prepare plugins fire on reference.
+				// [2118] Make sure the content prepare plugins fire on reference.
 				$item->reference = JHtml::_('content.prepare',$item->reference);
-				// [2039] Checking if reference has uikit components that must be loaded.
+				// [2120] 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)
 	{
-		// [2750] Get a db connection.
+		// [2831] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2752] Create a new query object.
+		// [2833] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2754] Get from #__costbenefitprojection_intervention as d
+		// [2835] 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');
 
-		// [2808] Reset the query using our newly populated query object.
+		// [2889] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2811] check if there was data returned
+		// [2892] check if there was data returned
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [2864] Convert the parameter fields into objects.
+			// [2945] Convert the parameter fields into objects.
 			foreach ($items as $nr => &$item)
 			{
-				// [2037] Make sure the content prepare plugins fire on description.
+				// [2118] Make sure the content prepare plugins fire on description.
 				$item->description = JHtml::_('content.prepare',$item->description);
-				// [2039] Checking if description has uikit components that must be loaded.
+				// [2120] Checking if description has uikit components that must be loaded.
 				$this->uikitComp = CostbenefitprojectionHelper::getUikitComp($item->description,$this->uikitComp);
-				// [2037] Make sure the content prepare plugins fire on reference.
+				// [2118] Make sure the content prepare plugins fire on reference.
 				$item->reference = JHtml::_('content.prepare',$item->reference);
-				// [2039] Checking if reference has uikit components that must be loaded.
+				// [2120] 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)
 	{
-		// [2750] Get a db connection.
+		// [2831] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2752] Create a new query object.
+		// [2833] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2754] Get from #__costbenefitprojection_causerisk as g
+		// [2835] 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'));
 
-		// [2760] Check if $causesrisks is an array with values.
+		// [2841] 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;
 		}
 
-		// [2808] Reset the query using our newly populated query object.
+		// [2889] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2811] check if there was data returned
+		// [2892] check if there was data returned
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [2864] Convert the parameter fields into objects.
+			// [2945] Convert the parameter fields into objects.
 			foreach ($items as $nr => &$item)
 			{
-				// [2037] Make sure the content prepare plugins fire on description.
+				// [2118] Make sure the content prepare plugins fire on description.
 				$item->description = JHtml::_('content.prepare',$item->description);
-				// [2039] Checking if description has uikit components that must be loaded.
+				// [2120] 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)
 	{
-		// [2750] Get a db connection.
+		// [2831] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2752] Create a new query object.
+		// [2833] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2754] Get from #__costbenefitprojection_health_data as bb
+		// [2835] 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));
-				// [2152] Check if $this->e_causesrisks is an array with values.
+				// [2233] 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');
 
-		// [2808] Reset the query using our newly populated query object.
+		// [2889] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2811] check if there was data returned
+		// [2892] 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)
 	{
-		// [2750] Get a db connection.
+		// [2831] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2752] Create a new query object.
+		// [2833] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2754] Get from #__costbenefitprojection_causerisk as gg
+		// [2835] 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'));
 
-		// [2760] Check if $causesrisks is an array with values.
+		// [2841] 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;
 		}
 
-		// [2808] Reset the query using our newly populated query object.
+		// [2889] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2811] check if there was data returned
+		// [2892] check if there was data returned
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [2864] Convert the parameter fields into objects.
+			// [2945] Convert the parameter fields into objects.
 			foreach ($items as $nr => &$item)
 			{
-				// [2037] Make sure the content prepare plugins fire on description.
+				// [2118] Make sure the content prepare plugins fire on description.
 				$item->description = JHtml::_('content.prepare',$item->description);
-				// [2039] Checking if description has uikit components that must be loaded.
+				// [2120] 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 36f6c738..cb5c3c1a 100644
--- a/site/models/cpanel.php
+++ b/site/models/cpanel.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		cpanel.php
@@ -59,39 +59,39 @@ class CostbenefitprojectionModelCpanel extends JModelList
 		$this->app		= JFactory::getApplication();
 		$this->input		= $this->app->input;
 		$this->initSet		= true; 
-		// [2952] Make sure all records load, since no pagination allowed.
+		// [3033] Make sure all records load, since no pagination allowed.
 		$this->setState('list.limit', 0);
-		// [2954] Get a db connection.
+		// [3035] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2957] Create a new query object.
+		// [3038] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [1820] Get from #__costbenefitprojection_company as a
+		// [1901] Get from #__costbenefitprojection_company as a
 		$query->select($db->quoteName(
 			array('a.id','a.asset_id','a.name','a.user','a.department','a.per','a.email','a.country','a.serviceprovider','a.datayear','a.working_days','a.total_salary','a.total_healthcare','a.productivity_losses','a.males','a.females','a.medical_turnovers_males','a.medical_turnovers_females','a.sick_leave_males','a.sick_leave_females','a.percentmale','a.percentfemale','a.causesrisks','a.not_required','a.published','a.checked_out','a.checked_out_time','a.created_by','a.modified_by','a.created','a.modified','a.version','a.hits','a.ordering'),
 			array('id','asset_id','name','user','department','per','email','country','serviceprovider','datayear','working_days','total_salary','total_healthcare','productivity_losses','males','females','medical_turnovers_males','medical_turnovers_females','sick_leave_males','sick_leave_females','percentmale','percentfemale','causesrisks','not_required','published','checked_out','checked_out_time','created_by','modified_by','created','modified','version','hits','ordering')));
 		$query->from($db->quoteName('#__costbenefitprojection_company', 'a'));
 
-		// [1820] Get from #__costbenefitprojection_country as b
+		// [1901] Get from #__costbenefitprojection_country as b
 		$query->select($db->quoteName(
 			array('b.name','b.user','b.publicname','b.publicemail','b.publicnumber','b.publicaddress'),
 			array('country_name','country_user','country_publicname','country_publicemail','country_publicnumber','country_publicaddress')));
 		$query->join('LEFT', ($db->quoteName('#__costbenefitprojection_country', 'b')) . ' ON (' . $db->quoteName('a.country') . ' = ' . $db->quoteName('b.id') . ')');
 
-		// [1820] Get from #__costbenefitprojection_service_provider as c
+		// [1901] Get from #__costbenefitprojection_service_provider as c
 		$query->select($db->quoteName(
 			array('c.user','c.publicname','c.publicemail','c.publicnumber','c.publicaddress'),
 			array('service_provider_user','service_provider_publicname','service_provider_publicemail','service_provider_publicnumber','service_provider_publicaddress')));
 		$query->join('LEFT', ($db->quoteName('#__costbenefitprojection_service_provider', 'c')) . ' ON (' . $db->quoteName('a.serviceprovider') . ' = ' . $db->quoteName('c.id') . ')');
 
-		// [1820] Get from #__costbenefitprojection_currency as g
+		// [1901] Get from #__costbenefitprojection_currency as g
 		$query->select($db->quoteName(
 			array('g.id','g.name','g.codethree','g.numericcode','g.symbol','g.thousands','g.decimalplace','g.decimalsymbol','g.positivestyle','g.negativestyle'),
 			array('currency_id','currency_name','currency_codethree','currency_numericcode','currency_symbol','currency_thousands','currency_decimalplace','currency_decimalsymbol','currency_positivestyle','currency_negativestyle')));
 		$query->join('LEFT', ($db->quoteName('#__costbenefitprojection_currency', 'g')) . ' ON (' . $db->quoteName('b.currency') . ' = ' . $db->quoteName('g.codethree') . ')');
 
-		// [1820] Get from #__users as d
+		// [1901] Get from #__users as d
 		$query->select($db->quoteName(
 			array('d.name'),
 			array('service_provider_name')));
@@ -99,7 +99,7 @@ class CostbenefitprojectionModelCpanel extends JModelList
 		$query->where('a.user = ' . (int) $this->userId);
 		$query->order('a.ordering ASC');
 
-		// [2970] return the query object
+		// [3051] return the query object
 		return $query;
 	}
 
@@ -125,72 +125,72 @@ class CostbenefitprojectionModelCpanel extends JModelList
 		// Get the global params
 		$globalParams = JComponentHelper::getParams('com_costbenefitprojection', true);
 
-		// [3059] Get the advanced encription.
+		// [3140] Get the advanced encription.
 		$advancedkey = CostbenefitprojectionHelper::getCryptKey('advanced');
-		// [3061] Get the encription object.
+		// [3142] Get the encription object.
 		$advanced = new FOFEncryptAes($advancedkey, 256);
 
-		// [2985] Convert the parameter fields into objects.
+		// [3066] Convert the parameter fields into objects.
 		foreach ($items as $nr => &$item)
 		{
-			// [2988] Always create a slug for sef URL's
+			// [3069] 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)))
 			{
-				// [2022] Decode medical_turnovers_males
+				// [2103] 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)))
 			{
-				// [2022] Decode sick_leave_males
+				// [2103] 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)))
 			{
-				// [2022] Decode males
+				// [2103] Decode males
 				$item->males = rtrim($advanced->decryptString($item->males), "\0");
 			}
 			if (CostbenefitprojectionHelper::checkString($item->causesrisks))
 			{
-				// [2022] Decode causesrisks
+				// [2103] 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)))
 			{
-				// [2022] Decode females
+				// [2103] 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)))
 			{
-				// [2022] Decode medical_turnovers_females
+				// [2103] 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)))
 			{
-				// [2022] Decode sick_leave_females
+				// [2103] 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)))
 			{
-				// [2022] Decode total_salary
+				// [2103] 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)))
 			{
-				// [2022] Decode total_healthcare
+				// [2103] Decode total_healthcare
 				$item->total_healthcare = rtrim($advanced->decryptString($item->total_healthcare), "\0");
 			}
-			// [2037] Make sure the content prepare plugins fire on country_publicaddress.
+			// [2118] Make sure the content prepare plugins fire on country_publicaddress.
 			$item->country_publicaddress = JHtml::_('content.prepare',$item->country_publicaddress);
-			// [2039] Checking if country_publicaddress has uikit components that must be loaded.
+			// [2120] Checking if country_publicaddress has uikit components that must be loaded.
 			$this->uikitComp = CostbenefitprojectionHelper::getUikitComp($item->country_publicaddress,$this->uikitComp);
-			// [2037] Make sure the content prepare plugins fire on service_provider_publicaddress.
+			// [2118] Make sure the content prepare plugins fire on service_provider_publicaddress.
 			$item->service_provider_publicaddress = JHtml::_('content.prepare',$item->service_provider_publicaddress);
-			// [2039] Checking if service_provider_publicaddress has uikit components that must be loaded.
+			// [2120] Checking if service_provider_publicaddress has uikit components that must be loaded.
 			$this->uikitComp = CostbenefitprojectionHelper::getUikitComp($item->service_provider_publicaddress,$this->uikitComp);
-			// [2070] set idCompanyScaling_factorD to the $item object.
+			// [2151] set idCompanyScaling_factorD to the $item object.
 			$item->idCompanyScaling_factorD = $this->getIdCompanyScaling_factorBdef_D($item->id);
-			// [2070] set idCompanyInterventionE to the $item object.
+			// [2151] set idCompanyInterventionE to the $item object.
 			$item->idCompanyInterventionE = $this->getIdCompanyInterventionBdef_E($item->id);
 		} 
 
@@ -206,41 +206,41 @@ class CostbenefitprojectionModelCpanel extends JModelList
 	*/
 	public function getIdCompanyScaling_factorBdef_D($id)
 	{
-		// [2750] Get a db connection.
+		// [2831] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2752] Create a new query object.
+		// [2833] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2754] Get from #__costbenefitprojection_scaling_factor as d
+		// [2835] 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')));
 		$query->from($db->quoteName('#__costbenefitprojection_scaling_factor', 'd'));
 		$query->where('d.company = ' . $db->quote($id));
 
-		// [1820] Get from #__costbenefitprojection_causerisk as f
+		// [1901] Get from #__costbenefitprojection_causerisk as f
 		$query->select($db->quoteName(
 			array('f.name'),
 			array('causerisk_name')));
 		$query->join('LEFT', ($db->quoteName('#__costbenefitprojection_causerisk', 'f')) . ' ON (' . $db->quoteName('d.causerisk') . ' = ' . $db->quoteName('f.id') . ')');
 		$query->order('d.ordering ASC');
 
-		// [2808] Reset the query using our newly populated query object.
+		// [2889] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2811] check if there was data returned
+		// [2892] check if there was data returned
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [2864] Convert the parameter fields into objects.
+			// [2945] Convert the parameter fields into objects.
 			foreach ($items as $nr => &$item)
 			{
-				// [2037] Make sure the content prepare plugins fire on reference.
+				// [2118] Make sure the content prepare plugins fire on reference.
 				$item->reference = JHtml::_('content.prepare',$item->reference);
-				// [2039] Checking if reference has uikit components that must be loaded.
+				// [2120] 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)
 	{
-		// [2750] Get a db connection.
+		// [2831] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2752] Create a new query object.
+		// [2833] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2754] Get from #__costbenefitprojection_intervention as e
+		// [2835] 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');
 
-		// [2808] Reset the query using our newly populated query object.
+		// [2889] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2811] check if there was data returned
+		// [2892] check if there was data returned
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [2864] Convert the parameter fields into objects.
+			// [2945] Convert the parameter fields into objects.
 			foreach ($items as $nr => &$item)
 			{
 				if (CostbenefitprojectionHelper::checkString($item->interventions))
 				{
-					// [2022] Decode interventions
+					// [2103] Decode interventions
 					$item->interventions = json_decode($item->interventions, true);
 				}
-				// [2037] Make sure the content prepare plugins fire on description.
+				// [2118] Make sure the content prepare plugins fire on description.
 				$item->description = JHtml::_('content.prepare',$item->description);
-				// [2039] Checking if description has uikit components that must be loaded.
+				// [2120] Checking if description has uikit components that must be loaded.
 				$this->uikitComp = CostbenefitprojectionHelper::getUikitComp($item->description,$this->uikitComp);
-				// [2037] Make sure the content prepare plugins fire on reference.
+				// [2118] Make sure the content prepare plugins fire on reference.
 				$item->reference = JHtml::_('content.prepare',$item->reference);
-				// [2039] Checking if reference has uikit components that must be loaded.
+				// [2120] 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 600f3e2e..ad89caec 100644
--- a/site/models/createaccount.php
+++ b/site/models/createaccount.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		createaccount.php
@@ -59,15 +59,15 @@ class CostbenefitprojectionModelCreateaccount extends JModelList
 		$this->app		= JFactory::getApplication();
 		$this->input		= $this->app->input;
 		$this->initSet		= true; 
-		// [2952] Make sure all records load, since no pagination allowed.
+		// [3033] Make sure all records load, since no pagination allowed.
 		$this->setState('list.limit', 0);
-		// [2954] Get a db connection.
+		// [3035] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2957] Create a new query object.
+		// [3038] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [1820] Get from #__costbenefitprojection_country as a
+		// [1901] Get from #__costbenefitprojection_country as a
 		$query->select($db->quoteName(
 			array('a.id','a.user','a.name','a.publicname','a.publicemail','a.publicnumber','a.publicaddress'),
 			array('id','user','name','publicname','publicemail','publicnumber','publicaddress')));
@@ -82,7 +82,7 @@ class CostbenefitprojectionModelCreateaccount extends JModelList
 		$query->where('a.published = 1');
 		$query->order('a.name ASC');
 
-		// [2970] return the query object
+		// [3051] return the query object
 		return $query;
 	}
 
@@ -108,16 +108,16 @@ class CostbenefitprojectionModelCreateaccount extends JModelList
 		// Get the global params
 		$globalParams = JComponentHelper::getParams('com_costbenefitprojection', true);
 
-		// [2985] Convert the parameter fields into objects.
+		// [3066] Convert the parameter fields into objects.
 		foreach ($items as $nr => &$item)
 		{
-			// [2988] Always create a slug for sef URL's
+			// [3069] Always create a slug for sef URL's
 			$item->slug = (isset($item->alias)) ? $item->id.':'.$item->alias : $item->id;
-			// [2037] Make sure the content prepare plugins fire on publicaddress.
+			// [2118] Make sure the content prepare plugins fire on publicaddress.
 			$item->publicaddress = JHtml::_('content.prepare',$item->publicaddress);
-			// [2039] Checking if publicaddress has uikit components that must be loaded.
+			// [2120] Checking if publicaddress has uikit components that must be loaded.
 			$this->uikitComp = CostbenefitprojectionHelper::getUikitComp($item->publicaddress,$this->uikitComp);
-			// [2070] set idCountryService_providerB to the $item object.
+			// [2151] 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)
 	{
-		// [2750] Get a db connection.
+		// [2831] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2752] Create a new query object.
+		// [2833] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2754] Get from #__costbenefitprojection_service_provider as b
+		// [2835] 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');
 
-		// [2808] Reset the query using our newly populated query object.
+		// [2889] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2811] check if there was data returned
+		// [2892] check if there was data returned
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [2864] Convert the parameter fields into objects.
+			// [2945] Convert the parameter fields into objects.
 			foreach ($items as $nr => &$item)
 			{
-				// [2037] Make sure the content prepare plugins fire on publicaddress.
+				// [2118] Make sure the content prepare plugins fire on publicaddress.
 				$item->publicaddress = JHtml::_('content.prepare',$item->publicaddress);
-				// [2039] Checking if publicaddress has uikit components that must be loaded.
+				// [2120] 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 1f2fdcbe..2a67f464 100644
--- a/site/models/forms/company.js
+++ b/site/models/forms/company.js
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		company.js
@@ -17,178 +17,178 @@
 /------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_FemBBLxWWw_required = false;
-jform_FemBBLxOlP_required = false;
-jform_FemBBLxnqq_required = false;
-jform_FemBBLxxqn_required = false;
-jform_FemBBLxlWa_required = false;
-jform_FemBBLxJnd_required = false;
-jform_FemBBLxGml_required = false;
+jform_bETABWBlov_required = false;
+jform_bETABWBfSN_required = false;
+jform_bETABWBwqJ_required = false;
+jform_bETABWBsAq_required = false;
+jform_bETABWBBFR_required = false;
+jform_bETABWBYeQ_required = false;
+jform_bETABWBPbA_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var department_FemBBLx = jQuery("#jform_department input[type='radio']:checked").val();
-	FemBBLx(department_FemBBLx);
+	var department_bETABWB = jQuery("#jform_department input[type='radio']:checked").val();
+	bETABWB(department_bETABWB);
 
-	var department_kUrQZMs = jQuery("#jform_department input[type='radio']:checked").val();
-	kUrQZMs(department_kUrQZMs);
+	var department_RkgSPam = jQuery("#jform_department input[type='radio']:checked").val();
+	RkgSPam(department_RkgSPam);
 });
 
-// the FemBBLx function
-function FemBBLx(department_FemBBLx)
+// the bETABWB function
+function bETABWB(department_bETABWB)
 {
-	// [8093] set the function logic
-	if (department_FemBBLx == 2)
+	// [8260] set the function logic
+	if (department_bETABWB == 2)
 	{
 		jQuery('#jform_causesrisks').closest('.control-group').show();
-		if (jform_FemBBLxWWw_required)
+		if (jform_bETABWBlov_required)
 		{
 			updateFieldRequired('causesrisks',0);
 			jQuery('#jform_causesrisks').prop('required','required');
 			jQuery('#jform_causesrisks').attr('aria-required',true);
 			jQuery('#jform_causesrisks').addClass('required');
-			jform_FemBBLxWWw_required = false;
+			jform_bETABWBlov_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_FemBBLxOlP_required)
+		if (jform_bETABWBfSN_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_FemBBLxOlP_required = false;
+			jform_bETABWBfSN_required = false;
 		}
 
 		jQuery('#jform_medical_turnovers_females').closest('.control-group').show();
-		if (jform_FemBBLxnqq_required)
+		if (jform_bETABWBwqJ_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_FemBBLxnqq_required = false;
+			jform_bETABWBwqJ_required = false;
 		}
 
 		jQuery('#jform_medical_turnovers_males').closest('.control-group').show();
-		if (jform_FemBBLxxqn_required)
+		if (jform_bETABWBsAq_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_FemBBLxxqn_required = false;
+			jform_bETABWBsAq_required = false;
 		}
 
 		jQuery('#jform_sick_leave_females').closest('.control-group').show();
-		if (jform_FemBBLxlWa_required)
+		if (jform_bETABWBBFR_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_FemBBLxlWa_required = false;
+			jform_bETABWBBFR_required = false;
 		}
 
 		jQuery('#jform_sick_leave_males').closest('.control-group').show();
-		if (jform_FemBBLxJnd_required)
+		if (jform_bETABWBYeQ_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_FemBBLxJnd_required = false;
+			jform_bETABWBYeQ_required = false;
 		}
 
 		jQuery('#jform_total_healthcare').closest('.control-group').show();
-		if (jform_FemBBLxGml_required)
+		if (jform_bETABWBPbA_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_FemBBLxGml_required = false;
+			jform_bETABWBPbA_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_causesrisks').closest('.control-group').hide();
-		if (!jform_FemBBLxWWw_required)
+		if (!jform_bETABWBlov_required)
 		{
 			updateFieldRequired('causesrisks',1);
 			jQuery('#jform_causesrisks').removeAttr('required');
 			jQuery('#jform_causesrisks').removeAttr('aria-required');
 			jQuery('#jform_causesrisks').removeClass('required');
-			jform_FemBBLxWWw_required = true;
+			jform_bETABWBlov_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_FemBBLxOlP_required)
+		if (!jform_bETABWBfSN_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_FemBBLxOlP_required = true;
+			jform_bETABWBfSN_required = true;
 		}
 		jQuery('#jform_medical_turnovers_females').closest('.control-group').hide();
-		if (!jform_FemBBLxnqq_required)
+		if (!jform_bETABWBwqJ_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_FemBBLxnqq_required = true;
+			jform_bETABWBwqJ_required = true;
 		}
 		jQuery('#jform_medical_turnovers_males').closest('.control-group').hide();
-		if (!jform_FemBBLxxqn_required)
+		if (!jform_bETABWBsAq_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_FemBBLxxqn_required = true;
+			jform_bETABWBsAq_required = true;
 		}
 		jQuery('#jform_sick_leave_females').closest('.control-group').hide();
-		if (!jform_FemBBLxlWa_required)
+		if (!jform_bETABWBBFR_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_FemBBLxlWa_required = true;
+			jform_bETABWBBFR_required = true;
 		}
 		jQuery('#jform_sick_leave_males').closest('.control-group').hide();
-		if (!jform_FemBBLxJnd_required)
+		if (!jform_bETABWBYeQ_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_FemBBLxJnd_required = true;
+			jform_bETABWBYeQ_required = true;
 		}
 		jQuery('#jform_total_healthcare').closest('.control-group').hide();
-		if (!jform_FemBBLxGml_required)
+		if (!jform_bETABWBPbA_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_FemBBLxGml_required = true;
+			jform_bETABWBPbA_required = true;
 		}
 	}
 }
 
-// the kUrQZMs function
-function kUrQZMs(department_kUrQZMs)
+// the RkgSPam function
+function RkgSPam(department_RkgSPam)
 {
-	// [8093] set the function logic
-	if (department_kUrQZMs == 1)
+	// [8260] set the function logic
+	if (department_RkgSPam == 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 6327339a..2c2289c9 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">
-		<!-- [11104] Default Fields. -->
-		<!-- [11105] Id Field. Type: Text (joomla) -->
+		<!-- [11275] Default Fields. -->
+		<!-- [11276] 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"
 		/>
-		<!-- [11112] Date Created Field. Type: Calendar (joomla) -->
+		<!-- [11283] 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"
 		/>
-		<!-- [11123] User Created Field. Type: User (joomla) -->
+		<!-- [11294] 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"
 		/>
-		<!-- [11131] Published Field. Type: List (joomla) -->
+		<!-- [11302] 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>
-		<!-- [11146] Date Modified Field. Type: Calendar (joomla) -->
+		<!-- [11317] 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" />
-		<!-- [11150] User Modified Field. Type: User (joomla) -->
+		<!-- [11321] User Modified Field. Type: User (joomla) -->
 		<field name="modified_by" type="user"
 			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
 			class="readonly"
 			readonly="true"
 			filter="unset"
 		/>
-		<!-- [11160] Access Field. Type: Accesslevel (joomla) -->
+		<!-- [11331] Access Field. Type: Accesslevel (joomla) -->
 		<field name="access"
 			type="accesslevel"
 			label="JFIELD_ACCESS_LABEL"
@@ -61,7 +61,7 @@
 			default="1"
 			required="false"
 		/>
-		<!-- [11170] Ordering Field. Type: Numbers (joomla) -->
+		<!-- [11341] Ordering Field. Type: Numbers (joomla) -->
 		<field
 			name="ordering"
 			type="number"
@@ -72,7 +72,7 @@
 			size="6"
 			required="false"
 		/>
-		<!-- [11182] Version Field. Type: Text (joomla) -->
+		<!-- [11353] Version Field. Type: Text (joomla) -->
 		<field
 			name="version"
 			type="text"
@@ -83,8 +83,8 @@
 			readonly="true"
 			filter="unset"
 		/>
-		<!-- [11215] Dynamic Fields. -->
-		<!-- [11451] Name Field. Type: Text. (joomla) -->
+		<!-- [11386] Dynamic Fields. -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11451] Email Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11572] User Field. Type: Memberuser. (custom) -->
+		<!-- [11743] User Field. Type: Memberuser. (custom) -->
 		<field
 			type="memberuser"
 			name="user"
@@ -123,7 +123,7 @@
 			required="false"
 			hint="COM_COSTBENEFITPROJECTION_COMPANY_USER_HINT"
 		/>
-		<!-- [11365] Department Field. Type: Radio. (joomla) -->
+		<!-- [11536] Department Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
 			name="department"
@@ -131,13 +131,13 @@
 			class="btn-group"
 			default="1"
 			required="true">
-			<!-- [11437] Option Set. -->
+			<!-- [11608] Option Set. -->
 			<option value="1">
 				COM_COSTBENEFITPROJECTION_COMPANY_BASIC</option>
 			<option value="2">
 				COM_COSTBENEFITPROJECTION_COMPANY_ADVANCED</option>
 		</field>
-		<!-- [11572] Country Field. Type: Countries. (custom) -->
+		<!-- [11743] Country Field. Type: Countries. (custom) -->
 		<field
 			type="countries"
 			name="country"
@@ -148,7 +148,7 @@
 			default="0"
 			required="true"
 		/>
-		<!-- [11572] Serviceprovider Field. Type: Serviceprovider. (custom) -->
+		<!-- [11743] Serviceprovider Field. Type: Serviceprovider. (custom) -->
 		<field
 			type="serviceprovider"
 			name="serviceprovider"
@@ -159,7 +159,7 @@
 			required="true"
 			button="true"
 		/>
-		<!-- [11365] Per Field. Type: Radio. (joomla) -->
+		<!-- [11536] Per Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
 			name="per"
@@ -168,13 +168,13 @@
 			class="btn-group btn-group-yesno"
 			default="1"
 			required="true">
-			<!-- [11437] Option Set. -->
+			<!-- [11608] Option Set. -->
 			<option value="1">
 				COM_COSTBENEFITPROJECTION_COMPANY_OPEN</option>
 			<option value="0">
 				COM_COSTBENEFITPROJECTION_COMPANY_LOCKED</option>
 		</field>
-		<!-- [11451] Medical_turnovers_males Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11451] Sick_leave_males Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11451] Males Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11572] Causesrisks Field. Type: Causesriskscheck. (custom) -->
+		<!-- [11743] Causesrisks Field. Type: Causesriskscheck. (custom) -->
 		<field
 			type="causesriskscheck"
 			name="causesrisks"
@@ -230,9 +230,9 @@
 			class="list_class"
 			required="true"
 		/>
-		<!-- [11465] Age_groups_note Field. Type: Note. A None Database Field. (joomla) -->
+		<!-- [11636] 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" />
-		<!-- [11482] Percentfemale Field. Type: Repeatable. (joomla) -->
+		<!-- [11653] 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">
-					<!-- [11365] Age Field. Type: List. (joomla) -->
+					<!-- [11536] Age Field. Type: List. (joomla) -->
 					<field
 						type="list"
 						name="age"
@@ -253,7 +253,7 @@
 						class="list_class"
 						multiple="false"
 						filter="CMD">
-						<!-- [11437] Option Set. -->
+						<!-- [11608] 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>
-					<!-- [11451] Percent Field. Type: Text. (joomla) -->
+					<!-- [11622] Percent Field. Type: Text. (joomla) -->
 					<field
 						type="text"
 						name="percent"
@@ -292,7 +292,7 @@
 				</fieldset>
 			</fields>
 		</field>
-		<!-- [11451] Females Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11572] Datayear Field. Type: Datayear. (custom) -->
+		<!-- [11743] Datayear Field. Type: Datayear. (custom) -->
 		<field
 			type="datayear"
 			name="datayear"
@@ -318,7 +318,7 @@
 			multiple="false"
 			default="0"
 		/>
-		<!-- [11451] Medical_turnovers_females Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11451] Working_days Field. Type: Integer. (joomla) -->
+		<!-- [11622] Working_days Field. Type: Integer. (joomla) -->
 		<field
 			type="integer"
 			name="working_days"
@@ -347,7 +347,7 @@
 			last="365"
 			step="1"
 		/>
-		<!-- [11451] Sick_leave_females Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11451] Total_salary Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11482] Percentmale Field. Type: Repeatable. (joomla) -->
+		<!-- [11653] 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">
-					<!-- [11365] Age Field. Type: List. (joomla) -->
+					<!-- [11536] Age Field. Type: List. (joomla) -->
 					<field
 						type="list"
 						name="age"
@@ -400,7 +400,7 @@
 						class="list_class"
 						multiple="false"
 						filter="CMD">
-						<!-- [11437] Option Set. -->
+						<!-- [11608] 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>
-					<!-- [11451] Percent Field. Type: Text. (joomla) -->
+					<!-- [11622] Percent Field. Type: Text. (joomla) -->
 					<field
 						type="text"
 						name="percent"
@@ -439,7 +439,7 @@
 				</fieldset>
 			</fields>
 		</field>
-		<!-- [11451] Total_healthcare Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11465] Cause_risk_selection_note Field. Type: Note. A None Database Field. (joomla) -->
+		<!-- [11636] 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" />
-		<!-- [11451] Productivity_losses Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11451] Not_required Field. Type: Hidden. (joomla) -->
+		<!-- [11622] Not_required Field. Type: Hidden. (joomla) -->
 		<field
 			type="hidden"
 			name="not_required"
@@ -481,15 +481,15 @@
 		/>
 	</fieldset>
 	
-	<!-- [10138] Access Control Fields. -->
+	<!-- [10308] Access Control Fields. -->
 	<fieldset name="accesscontrol">
-		<!-- [10140] Asset Id Field. Type: Hidden (joomla) -->
+		<!-- [10310] Asset Id Field. Type: Hidden (joomla) -->
 		<field
 			name="asset_id"
 			type="hidden"
 			filter="unset"
 		/>
-		<!-- [10146] Rules Field. Type: Rules (joomla) -->
+		<!-- [10316] 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 c13a8e6a..af9b6a7b 100644
--- a/site/models/forms/intervention.js
+++ b/site/models/forms/intervention.js
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		intervention.js
@@ -17,54 +17,54 @@
 /------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_hhqVuoHOHO_required = false;
+jform_JxOMJHDKko_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var type_hhqVuoH = jQuery("#jform_type input[type='radio']:checked").val();
-	hhqVuoH(type_hhqVuoH);
+	var type_JxOMJHD = jQuery("#jform_type input[type='radio']:checked").val();
+	JxOMJHD(type_JxOMJHD);
 
-	var type_LZHLLUr = jQuery("#jform_type input[type='radio']:checked").val();
-	LZHLLUr(type_LZHLLUr);
+	var type_SnkLovW = jQuery("#jform_type input[type='radio']:checked").val();
+	SnkLovW(type_SnkLovW);
 });
 
-// the hhqVuoH function
-function hhqVuoH(type_hhqVuoH)
+// the JxOMJHD function
+function JxOMJHD(type_JxOMJHD)
 {
-	// [8093] set the function logic
-	if (type_hhqVuoH == 2)
+	// [8260] set the function logic
+	if (type_JxOMJHD == 2)
 	{
 		jQuery('#jform_interventions').closest('.control-group').show();
-		if (jform_hhqVuoHOHO_required)
+		if (jform_JxOMJHDKko_required)
 		{
 			updateFieldRequired('interventions',0);
 			jQuery('#jform_interventions').prop('required','required');
 			jQuery('#jform_interventions').attr('aria-required',true);
 			jQuery('#jform_interventions').addClass('required');
-			jform_hhqVuoHOHO_required = false;
+			jform_JxOMJHDKko_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_interventions').closest('.control-group').hide();
-		if (!jform_hhqVuoHOHO_required)
+		if (!jform_JxOMJHDKko_required)
 		{
 			updateFieldRequired('interventions',1);
 			jQuery('#jform_interventions').removeAttr('required');
 			jQuery('#jform_interventions').removeAttr('aria-required');
 			jQuery('#jform_interventions').removeClass('required');
-			jform_hhqVuoHOHO_required = true;
+			jform_JxOMJHDKko_required = true;
 		}
 	}
 }
 
-// the LZHLLUr function
-function LZHLLUr(type_LZHLLUr)
+// the SnkLovW function
+function SnkLovW(type_SnkLovW)
 {
-	// [8093] set the function logic
-	if (type_LZHLLUr == 1)
+	// [8260] set the function logic
+	if (type_SnkLovW == 1)
 	{
 		jQuery('#jform_intervention').closest('.control-group').show();
 	}
diff --git a/site/models/forms/intervention.xml b/site/models/forms/intervention.xml
index 14fe6a80..0326ddcd 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">
-		<!-- [11104] Default Fields. -->
-		<!-- [11105] Id Field. Type: Text (joomla) -->
+		<!-- [11275] Default Fields. -->
+		<!-- [11276] 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"
 		/>
-		<!-- [11112] Date Created Field. Type: Calendar (joomla) -->
+		<!-- [11283] 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"
 		/>
-		<!-- [11123] User Created Field. Type: User (joomla) -->
+		<!-- [11294] 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"
 		/>
-		<!-- [11131] Published Field. Type: List (joomla) -->
+		<!-- [11302] 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>
-		<!-- [11146] Date Modified Field. Type: Calendar (joomla) -->
+		<!-- [11317] 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" />
-		<!-- [11150] User Modified Field. Type: User (joomla) -->
+		<!-- [11321] User Modified Field. Type: User (joomla) -->
 		<field name="modified_by" type="user"
 			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
 			class="readonly"
 			readonly="true"
 			filter="unset"
 		/>
-		<!-- [11170] Ordering Field. Type: Numbers (joomla) -->
+		<!-- [11341] Ordering Field. Type: Numbers (joomla) -->
 		<field
 			name="ordering"
 			type="number"
@@ -64,7 +64,7 @@
 			size="6"
 			required="false"
 		/>
-		<!-- [11182] Version Field. Type: Text (joomla) -->
+		<!-- [11353] Version Field. Type: Text (joomla) -->
 		<field
 			name="version"
 			type="text"
@@ -75,8 +75,8 @@
 			readonly="true"
 			filter="unset"
 		/>
-		<!-- [11215] Dynamic Fields. -->
-		<!-- [11451] Name Field. Type: Text. (joomla) -->
+		<!-- [11386] Dynamic Fields. -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11572] Company Field. Type: Company. (custom) -->
+		<!-- [11743] Company Field. Type: Company. (custom) -->
 		<field
 			type="company"
 			name="company"
@@ -102,7 +102,7 @@
 			default="0"
 			button="true"
 		/>
-		<!-- [11365] Type Field. Type: Radio. (joomla) -->
+		<!-- [11536] Type Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
 			name="type"
@@ -111,13 +111,13 @@
 			class="btn-group"
 			default="1"
 			required="true">
-			<!-- [11437] Option Set. -->
+			<!-- [11608] Option Set. -->
 			<option value="1">
 				COM_COSTBENEFITPROJECTION_INTERVENTION_SINGLE</option>
 			<option value="2">
 				COM_COSTBENEFITPROJECTION_INTERVENTION_CLUSTER</option>
 		</field>
-		<!-- [11451] Coverage Field. Type: Integer. (joomla) -->
+		<!-- [11622] Coverage Field. Type: Integer. (joomla) -->
 		<field
 			type="integer"
 			name="coverage"
@@ -128,7 +128,7 @@
 			last="100"
 			step="10"
 		/>
-		<!-- [11451] Duration Field. Type: Integer. (joomla) -->
+		<!-- [11622] Duration Field. Type: Integer. (joomla) -->
 		<field
 			type="integer"
 			name="duration"
@@ -140,7 +140,7 @@
 			last="20"
 			step="1"
 		/>
-		<!-- [11451] Description Field. Type: Textarea. (joomla) -->
+		<!-- [11622] Description Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
 			name="description"
@@ -152,7 +152,7 @@
 			filter="HTML"
 			hint="COM_COSTBENEFITPROJECTION_INTERVENTION_DESCRIPTION_HINT"
 		/>
-		<!-- [11482] Intervention Field. Type: Repeatable. (joomla) -->
+		<!-- [11653] 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">
-					<!-- [11572] Causerisk Field. Type: Causesrisks. (custom) -->
+					<!-- [11743] Causerisk Field. Type: Causesrisks. (custom) -->
 					<field
 						type="causesrisks"
 						name="causerisk"
@@ -175,7 +175,7 @@
 						default="0"
 						button="false"
 					/>
-					<!-- [11451] Cpe Field. Type: Text. (joomla) -->
+					<!-- [11622] Cpe Field. Type: Text. (joomla) -->
 					<field
 						type="text"
 						name="cpe"
@@ -186,7 +186,7 @@
 						class="text_area"
 						filter="INT"
 					/>
-					<!-- [11451] Mbr Field. Type: Text. (joomla) -->
+					<!-- [11622] Mbr Field. Type: Text. (joomla) -->
 					<field
 						type="text"
 						name="mbr"
@@ -197,7 +197,7 @@
 						class="text_area"
 						filter="INT"
 					/>
-					<!-- [11451] Mtr Field. Type: Text. (joomla) -->
+					<!-- [11622] Mtr Field. Type: Text. (joomla) -->
 					<field
 						type="text"
 						name="mtr"
@@ -211,7 +211,7 @@
 				</fieldset>
 			</fields>
 		</field>
-		<!-- [11451] Reference Field. Type: Textarea. (joomla) -->
+		<!-- [11622] Reference Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
 			name="reference"
@@ -223,7 +223,7 @@
 			filter="HTML"
 			hint="COM_COSTBENEFITPROJECTION_INTERVENTION_REFERENCE_HINT"
 		/>
-		<!-- [11572] Interventions Field. Type: Interventions. (custom) -->
+		<!-- [11743] Interventions Field. Type: Interventions. (custom) -->
 		<field
 			type="interventions"
 			name="interventions"
@@ -233,7 +233,7 @@
 			required="true"
 			button="false"
 		/>
-		<!-- [11365] Share Field. Type: List. (joomla) -->
+		<!-- [11536] Share Field. Type: List. (joomla) -->
 		<field
 			type="list"
 			name="share"
@@ -244,7 +244,7 @@
 			filter="INT"
 			required="true"
 			default="3">
-			<!-- [11437] Option Set. -->
+			<!-- [11608] 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>
-		<!-- [11451] Not_required Field. Type: Hidden. (joomla) -->
+		<!-- [11622] Not_required Field. Type: Hidden. (joomla) -->
 		<field
 			type="hidden"
 			name="not_required"
@@ -260,15 +260,15 @@
 		/>
 	</fieldset>
 	
-	<!-- [10138] Access Control Fields. -->
+	<!-- [10308] Access Control Fields. -->
 	<fieldset name="accesscontrol">
-		<!-- [10140] Asset Id Field. Type: Hidden (joomla) -->
+		<!-- [10310] Asset Id Field. Type: Hidden (joomla) -->
 		<field
 			name="asset_id"
 			type="hidden"
 			filter="unset"
 		/>
-		<!-- [10146] Rules Field. Type: Rules (joomla) -->
+		<!-- [10316] 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 605af7aa..24e5ae6f 100644
--- a/site/models/forms/scaling_factor.js
+++ b/site/models/forms/scaling_factor.js
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		scaling_factor.js
diff --git a/site/models/forms/scaling_factor.xml b/site/models/forms/scaling_factor.xml
index b7f23b23..7457ed01 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">
-		<!-- [11104] Default Fields. -->
-		<!-- [11105] Id Field. Type: Text (joomla) -->
+		<!-- [11275] Default Fields. -->
+		<!-- [11276] 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"
 		/>
-		<!-- [11112] Date Created Field. Type: Calendar (joomla) -->
+		<!-- [11283] 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"
 		/>
-		<!-- [11123] User Created Field. Type: User (joomla) -->
+		<!-- [11294] 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"
 		/>
-		<!-- [11131] Published Field. Type: List (joomla) -->
+		<!-- [11302] 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>
-		<!-- [11146] Date Modified Field. Type: Calendar (joomla) -->
+		<!-- [11317] 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" />
-		<!-- [11150] User Modified Field. Type: User (joomla) -->
+		<!-- [11321] User Modified Field. Type: User (joomla) -->
 		<field name="modified_by" type="user"
 			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
 			class="readonly"
 			readonly="true"
 			filter="unset"
 		/>
-		<!-- [11170] Ordering Field. Type: Numbers (joomla) -->
+		<!-- [11341] Ordering Field. Type: Numbers (joomla) -->
 		<field
 			name="ordering"
 			type="number"
@@ -64,7 +64,7 @@
 			size="6"
 			required="false"
 		/>
-		<!-- [11182] Version Field. Type: Text (joomla) -->
+		<!-- [11353] Version Field. Type: Text (joomla) -->
 		<field
 			name="version"
 			type="text"
@@ -75,8 +75,8 @@
 			readonly="true"
 			filter="unset"
 		/>
-		<!-- [11215] Dynamic Fields. -->
-		<!-- [11572] Causerisk Field. Type: Causesrisks. (custom) -->
+		<!-- [11386] Dynamic Fields. -->
+		<!-- [11743] Causerisk Field. Type: Causesrisks. (custom) -->
 		<field
 			type="causesrisks"
 			name="causerisk"
@@ -86,7 +86,7 @@
 			multiple="false"
 			default="0"
 		/>
-		<!-- [11572] Company Field. Type: Company. (custom) -->
+		<!-- [11743] Company Field. Type: Company. (custom) -->
 		<field
 			type="company"
 			name="company"
@@ -96,7 +96,7 @@
 			default="0"
 			button="true"
 		/>
-		<!-- [11451] Reference Field. Type: Textarea. (joomla) -->
+		<!-- [11622] Reference Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
 			name="reference"
@@ -108,7 +108,7 @@
 			filter="HTML"
 			hint="COM_COSTBENEFITPROJECTION_SCALING_FACTOR_REFERENCE_HINT"
 		/>
-		<!-- [11451] Yld_scaling_factor_males Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11451] Yld_scaling_factor_females Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11451] Mortality_scaling_factor_males Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11451] Mortality_scaling_factor_females Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11451] Presenteeism_scaling_factor_males Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11451] Presenteeism_scaling_factor_females Field. Type: Text. (joomla) -->
+		<!-- [11622] 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"
 		/>
-		<!-- [11451] Health_scaling_factor Field. Type: Text. (joomla) -->
+		<!-- [11622] Health_scaling_factor Field. Type: Text. (joomla) -->
 		<field
 			type="text"
 			name="health_scaling_factor"
@@ -229,15 +229,15 @@
 		/>
 	</fieldset>
 	
-	<!-- [10138] Access Control Fields. -->
+	<!-- [10308] Access Control Fields. -->
 	<fieldset name="accesscontrol">
-		<!-- [10140] Asset Id Field. Type: Hidden (joomla) -->
+		<!-- [10310] Asset Id Field. Type: Hidden (joomla) -->
 		<field
 			name="asset_id"
 			type="hidden"
 			filter="unset"
 		/>
-		<!-- [10146] Rules Field. Type: Rules (joomla) -->
+		<!-- [10316] Rules Field. Type: Rules (joomla) -->
 		<field
 			name="rules"
 			type="rules"
diff --git a/site/models/intervention.php b/site/models/intervention.php
index a26c53a0..11e2a722 100644
--- a/site/models/intervention.php
+++ b/site/models/intervention.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		intervention.php
@@ -91,7 +91,7 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 
 			if (!empty($item->interventions))
 			{
-				// [4059] JSON Decode interventions.
+				// [4223] 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)
-	{		// [9651] Get the form.
+	{		// [9818] 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;
 
-		// [9736] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first.
+		// [9903] 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');
 		}
-		// [9741] The back end uses id so we use that the rest of the time and set it to 0 by default.
+		// [9908] 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();
 
-		// [9747] Check for existing item.
-		// [9748] Modify the form based on Edit State access controls.
+		// [9914] Check for existing item.
+		// [9915] 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')))
 		{
-			// [9761] Disable fields for display.
+			// [9928] Disable fields for display.
 			$form->setFieldAttribute('ordering', 'disabled', 'true');
 			$form->setFieldAttribute('published', 'disabled', 'true');
-			// [9764] Disable fields while saving.
+			// [9931] Disable fields while saving.
 			$form->setFieldAttribute('ordering', 'filter', 'unset');
 			$form->setFieldAttribute('published', 'filter', 'unset');
 		}
-		// [9769] Modify the form based on Edit Creaded By access controls.
+		// [9936] Modify the form based on Edit Creaded By access controls.
 		if (!$user->authorise('core.edit.created_by', 'com_costbenefitprojection'))
 		{
-			// [9781] Disable fields for display.
+			// [9948] Disable fields for display.
 			$form->setFieldAttribute('created_by', 'disabled', 'true');
-			// [9783] Disable fields for display.
+			// [9950] Disable fields for display.
 			$form->setFieldAttribute('created_by', 'readonly', 'true');
-			// [9785] Disable fields while saving.
+			// [9952] Disable fields while saving.
 			$form->setFieldAttribute('created_by', 'filter', 'unset');
 		}
-		// [9788] Modify the form based on Edit Creaded Date access controls.
+		// [9955] Modify the form based on Edit Creaded Date access controls.
 		if (!$user->authorise('core.edit.created', 'com_costbenefitprojection'))
 		{
-			// [9800] Disable fields for display.
+			// [9967] Disable fields for display.
 			$form->setFieldAttribute('created', 'disabled', 'true');
-			// [9802] Disable fields while saving.
+			// [9969] Disable fields while saving.
 			$form->setFieldAttribute('created', 'filter', 'unset');
 		}
 
@@ -202,7 +202,7 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 			}
 
 			$user = JFactory::getUser();
-			// [9952] The record has been set. Check the record permissions.
+			// [10119] 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)
 		{
-			// [10039] The record has been set. Check the record permissions.
+			// [10206] 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;
 			}
 		}
-		// [10056] In the absense of better information, revert to the component permissions.
+		// [10223] 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')
 	{
-		// [9864] Check specific edit permission then general edit permission.
+		// [10031] 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)
 	{
-		// [8855] check if the not_required field is set
+		// [9022] 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);
-			// [8860] now change the required field attributes value
+			// [9027] now change the required field attributes value
 			foreach ($requiredFields as $requiredField)
 			{
-				// [8863] make sure there is a string value
+				// [9030] make sure there is a string value
 				if (CostbenefitprojectionHelper::checkString($requiredField))
 				{
-					// [8866] change to false
+					// [9033] change to false
 					$form->setFieldAttribute($requiredField, 'required', 'false');
-					// [8868] also clear the data set
+					// [9035] also clear the data set
 					$data[$requiredField] = '';
 				}
 			}
@@ -505,7 +505,7 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 	{
 		if (empty($this->batchSet))
 		{
-			// [5015] Set some needed variables.
+			// [5179] 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
 			}
 		}
 
-		// [5035] get list of uniqe fields
+		// [5199] get list of uniqe fields
 		$uniqeFields = $this->getUniqeFields();
-		// [5037] remove move_copy from array
+		// [5201] remove move_copy from array
 		unset($values['move_copy']);
 
-		// [5040] make sure published is set
+		// [5204] make sure published is set
 		if (!isset($values['published']))
 		{
 			$values['published'] = 0;
@@ -580,21 +580,21 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 
 		$newIds = array();
 
-		// [5077] Parent exists so let's proceed
+		// [5241] Parent exists so let's proceed
 		while (!empty($pks))
 		{
-			// [5080] Pop the first ID off the stack
+			// [5244] Pop the first ID off the stack
 			$pk = array_shift($pks);
 
 			$this->table->reset();
 
-			// [5085] only allow copy if user may edit this item.
+			// [5249] only allow copy if user may edit this item.
 
 			if (!$this->user->authorise('intervention.edit', $contexts[$pk]))
 
 			{
 
-				// [5095] Not fatal error
+				// [5259] Not fatal error
 
 				$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 
@@ -602,19 +602,19 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 
 			}
 
-			// [5100] Check that the row actually exists
+			// [5264] Check that the row actually exists
 			if (!$this->table->load($pk))
 			{
 				if ($error = $this->table->getError())
 				{
-					// [5105] Fatal error
+					// [5269] Fatal error
 					$this->setError($error);
 
 					return false;
 				}
 				else
 				{
-					// [5112] Not fatal error
+					// [5276] 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);
 
-			// [5148] insert all set values
+			// [5312] insert all set values
 			if (CostbenefitprojectionHelper::checkArray($values))
 			{
 				foreach ($values as $key => $value)
@@ -634,7 +634,7 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 				}
 			}
 
-			// [5160] update all uniqe fields
+			// [5324] update all uniqe fields
 			if (CostbenefitprojectionHelper::checkArray($uniqeFields))
 			{
 				foreach ($uniqeFields as $uniqeField)
@@ -643,13 +643,13 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 				}
 			}
 
-			// [5169] Reset the ID because we are making a copy
+			// [5333] Reset the ID because we are making a copy
 			$this->table->id = 0;
 
-			// [5172] TODO: Deal with ordering?
-			// [5173] $this->table->ordering	= 1;
+			// [5336] TODO: Deal with ordering?
+			// [5337] $this->table->ordering	= 1;
 
-			// [5175] Check the row.
+			// [5339] 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);
 			}
 
-			// [5188] Store the row.
+			// [5352] Store the row.
 			if (!$this->table->store())
 			{
 				$this->setError($this->table->getError());
@@ -670,14 +670,14 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 				return false;
 			}
 
-			// [5196] Get the new item ID
+			// [5360] Get the new item ID
 			$newId = $this->table->get('id');
 
-			// [5199] Add the new ID to the array
+			// [5363] Add the new ID to the array
 			$newIds[$pk] = $newId;
 		}
 
-		// [5203] Clean the cache
+		// [5367] Clean the cache
 		$this->cleanCache();
 
 		return $newIds;
@@ -698,7 +698,7 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 	{
 		if (empty($this->batchSet))
 		{
-			// [4817] Set some needed variables.
+			// [4981] 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
 			}
 		}
 
-		// [4839] make sure published only updates if user has the permission.
+		// [5003] make sure published only updates if user has the permission.
 		if (isset($values['published']) && !$this->canDo->get('intervention.edit.state'))
 		{
 			unset($values['published']);
 		}
-		// [4852] remove move_copy from array
+		// [5016] remove move_copy from array
 		unset($values['move_copy']);
 
-		// [4873] Parent exists so we proceed
+		// [5037] 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;
 			}
 
-			// [4890] Check that the row actually exists
+			// [5054] Check that the row actually exists
 			if (!$this->table->load($pk))
 			{
 				if ($error = $this->table->getError())
 				{
-					// [4895] Fatal error
+					// [5059] Fatal error
 					$this->setError($error);
 
 					return false;
 				}
 				else
 				{
-					// [4902] Not fatal error
+					// [5066] Not fatal error
 					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 					continue;
 				}
 			}
 
-			// [4908] insert all set values.
+			// [5072] insert all set values.
 			if (CostbenefitprojectionHelper::checkArray($values))
 			{
 				foreach ($values as $key => $value)
 				{
-					// [4913] Do special action for access.
+					// [5077] Do special action for access.
 					if ('access' == $key && strlen($value) > 0)
 					{
 						$this->table->$key = $value;
@@ -811,7 +811,7 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 			}
 
 
-			// [4925] Check the row.
+			// [5089] 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);
 			}
 
-			// [4938] Store the row.
+			// [5102] Store the row.
 			if (!$this->table->store())
 			{
 				$this->setError($this->table->getError());
@@ -833,7 +833,7 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 			}
 		}
 
-		// [4947] Clean the cache
+		// [5111] Clean the cache
 		$this->cleanCache();
 
 		return true;
@@ -863,7 +863,7 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
 			$data['metadata'] = (string) $metadata;
 		} 
 
-		// [4169] Set the interventions string to JSON string.
+		// [4333] 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;
 		}
 
-		// [5295] Alter the uniqe field for save as copy
+		// [5459] Alter the uniqe field for save as copy
 		if ($input->get('task') == 'save2copy')
 		{
-			// [5298] Automatic handling of other uniqe fields
+			// [5462] 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)
 	{
 
-		// [5353] Alter the title
+		// [5517] Alter the title
 		$table = $this->getTable();
 
 		while ($table->load(array('title' => $title)))
diff --git a/site/models/publicresults.php b/site/models/publicresults.php
index 995ed2fc..8db3cd2c 100644
--- a/site/models/publicresults.php
+++ b/site/models/publicresults.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publicresults.php
@@ -121,70 +121,70 @@ class CostbenefitprojectionModelPublicresults extends JModelItem
 		{
 			try
 			{
-				// [2370] Get a db connection.
+				// [2451] Get a db connection.
 				$db = JFactory::getDbo();
 
-				// [2372] Create a new query object.
+				// [2453] Create a new query object.
 				$query = $db->getQuery(true);
 
-				// [1820] Get from #__costbenefitprojection_country as a
+				// [1901] Get from #__costbenefitprojection_country as a
 				$query->select($db->quoteName(
 			array('a.id','a.currency','a.datayear','a.percentmale','a.percentfemale','a.causesrisks','a.published'),
 			array('country','currency','datayear','percentmale','percentfemale','causesrisks','published')));
 				$query->from($db->quoteName('#__costbenefitprojection_country', 'a'));
 
-				// [1820] Get from #__costbenefitprojection_country as e
+				// [1901] Get from #__costbenefitprojection_country as e
 				$query->select($db->quoteName(
 			array('e.id','e.name','e.alias','e.user','e.currency','e.datayear','e.worldzone','e.codethree','e.codetwo','e.working_days','e.presenteeism','e.medical_turnovers','e.sick_leave','e.healthcare','e.productivity_losses','e.publicname','e.publicemail','e.publicnumber','e.publicaddress','e.percentmale','e.percentfemale','e.causesrisks','e.maledeath','e.femaledeath','e.maleyld','e.femaleyld','e.access'),
 			array('country_id','country_name','country_alias','country_user','country_currency','country_datayear','country_worldzone','country_codethree','country_codetwo','country_working_days','country_presenteeism','country_medical_turnovers','country_sick_leave','country_healthcare','country_productivity_losses','country_publicname','country_publicemail','country_publicnumber','country_publicaddress','country_percentmale','country_percentfemale','country_causesrisks','country_maledeath','country_femaledeath','country_maleyld','country_femaleyld','country_access')));
 				$query->join('LEFT', ($db->quoteName('#__costbenefitprojection_country', 'e')) . ' ON (' . $db->quoteName('a.id') . ' = ' . $db->quoteName('e.id') . ')');
 
-				// [1820] Get from #__costbenefitprojection_currency as f
+				// [1901] Get from #__costbenefitprojection_currency as f
 				$query->select($db->quoteName(
 			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') . ')');
 				$query->where('a.id = ' . (int) $pk);
 
-				// [2383] Reset the query using our newly populated query object.
+				// [2464] Reset the query using our newly populated query object.
 				$db->setQuery($query);
-				// [2385] Load the results as a stdClass object.
+				// [2466] Load the results as a stdClass object.
 				$data = $db->loadObject();
 
 				if (empty($data))
 				{
-					// [2396] If no data is found redirect to default page and show warning.
+					// [2477] 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 (CostbenefitprojectionHelper::checkString($data->country_causesrisks))
 				{
-					// [2022] Decode country_causesrisks
+					// [2103] Decode country_causesrisks
 					$data->country_causesrisks = json_decode($data->country_causesrisks, true);
 				}
-				// [2037] Make sure the content prepare plugins fire on country_publicaddress.
+				// [2118] Make sure the content prepare plugins fire on country_publicaddress.
 				$data->country_publicaddress = JHtml::_('content.prepare',$data->country_publicaddress);
-				// [2039] Checking if country_publicaddress has uikit components that must be loaded.
+				// [2120] Checking if country_publicaddress has uikit components that must be loaded.
 				$this->uikitComp = CostbenefitprojectionHelper::getUikitComp($data->country_publicaddress,$this->uikitComp);
-				// [2342] set the global causesrisks value.
+				// [2423] set the global causesrisks value.
 				$this->a_causesrisks = $data->causesrisks;
-				// [2342] set the global datayear value.
+				// [2423] set the global datayear value.
 				$this->a_datayear = $data->datayear;
-				// [2342] set the global datayear value.
+				// [2423] set the global datayear value.
 				$this->e_datayear = $data->country_datayear;
-				// [2342] set the global causesrisks value.
+				// [2423] set the global causesrisks value.
 				$this->e_causesrisks = $data->country_causesrisks;
-				// [2070] set idCountryHealth_dataB to the $data object.
+				// [2151] set idCountryHealth_dataB to the $data object.
 				$data->idCountryHealth_dataB = $this->getIdCountryHealth_dataDadd_B($data->country);
-				// [2070] set causesrisksIdCauseriskG to the $data object.
+				// [2151] set causesrisksIdCauseriskG to the $data object.
 				$data->causesrisksIdCauseriskG = $this->getCausesrisksIdCauseriskDadd_G($data->causesrisks);
-				// [2070] set idCountryHealth_dataBB to the $data object.
+				// [2151] set idCountryHealth_dataBB to the $data object.
 				$data->idCountryHealth_dataBB = $this->getIdCountryHealth_dataDadd_BB($data->country);
-				// [2070] set causesrisksIdCauseriskGG to the $data object.
+				// [2151] set causesrisksIdCauseriskGG to the $data object.
 				$data->causesrisksIdCauseriskGG = $this->getCausesrisksIdCauseriskDadd_GG($data->country_causesrisks);
 
-				// [2490] set data object to item.
+				// [2571] set data object to item.
 				$this->_item[$pk] = $data;
 			}
 			catch (Exception $e)
@@ -226,19 +226,19 @@ class CostbenefitprojectionModelPublicresults extends JModelItem
 	*/
 	public function getIdCountryHealth_dataDadd_B($id)
 	{
-		// [2750] Get a db connection.
+		// [2831] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2752] Create a new query object.
+		// [2833] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2754] Get from #__costbenefitprojection_health_data as b
+		// [2835] 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($id));
-				// [2152] Check if $this->a_causesrisks is an array with values.
+				// [2233] Check if $this->a_causesrisks is an array with values.
 				$array = $this->a_causesrisks;
 				if (isset($array) && CostbenefitprojectionHelper::checkArray($array))
 				{
@@ -252,11 +252,11 @@ class CostbenefitprojectionModelPublicresults extends JModelItem
 		$query->where('b.year = ' . $db->quote($this->a_datayear));
 		$query->order('b.ordering ASC');
 
-		// [2808] Reset the query using our newly populated query object.
+		// [2889] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2811] check if there was data returned
+		// [2892] check if there was data returned
 		if ($db->getNumRows())
 		{
 			return $db->loadObjectList();
@@ -272,19 +272,19 @@ class CostbenefitprojectionModelPublicresults extends JModelItem
 	*/
 	public function getCausesrisksIdCauseriskDadd_G($causesrisks)
 	{
-		// [2750] Get a db connection.
+		// [2831] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2752] Create a new query object.
+		// [2833] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2754] Get from #__costbenefitprojection_causerisk as g
+		// [2835] 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'));
 
-		// [2760] Check if $causesrisks is an array with values.
+		// [2841] Check if $causesrisks is an array with values.
 		$array = $causesrisks;
 		if (isset($array) && CostbenefitprojectionHelper::checkArray($array))
 		{
@@ -295,11 +295,11 @@ class CostbenefitprojectionModelPublicresults extends JModelItem
 			return false;
 		}
 
-		// [2808] Reset the query using our newly populated query object.
+		// [2889] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2811] check if there was data returned
+		// [2892] check if there was data returned
 		if ($db->getNumRows())
 		{
 			return $db->loadObjectList();
@@ -315,19 +315,19 @@ class CostbenefitprojectionModelPublicresults extends JModelItem
 	*/
 	public function getIdCountryHealth_dataDadd_BB($id)
 	{
-		// [2750] Get a db connection.
+		// [2831] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2752] Create a new query object.
+		// [2833] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2754] Get from #__costbenefitprojection_health_data as bb
+		// [2835] 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($id));
-				// [2152] Check if $this->e_causesrisks is an array with values.
+				// [2233] Check if $this->e_causesrisks is an array with values.
 				$array = $this->e_causesrisks;
 				if (isset($array) && CostbenefitprojectionHelper::checkArray($array))
 				{
@@ -341,11 +341,11 @@ class CostbenefitprojectionModelPublicresults extends JModelItem
 		$query->where('bb.year = ' . $db->quote($this->e_datayear));
 		$query->order('bb.ordering ASC');
 
-		// [2808] Reset the query using our newly populated query object.
+		// [2889] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2811] check if there was data returned
+		// [2892] check if there was data returned
 		if ($db->getNumRows())
 		{
 			return $db->loadObjectList();
@@ -361,19 +361,19 @@ class CostbenefitprojectionModelPublicresults extends JModelItem
 	*/
 	public function getCausesrisksIdCauseriskDadd_GG($causesrisks)
 	{
-		// [2750] Get a db connection.
+		// [2831] Get a db connection.
 		$db = JFactory::getDbo();
 
-		// [2752] Create a new query object.
+		// [2833] Create a new query object.
 		$query = $db->getQuery(true);
 
-		// [2754] Get from #__costbenefitprojection_causerisk as gg
+		// [2835] 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'));
 
-		// [2760] Check if $causesrisks is an array with values.
+		// [2841] Check if $causesrisks is an array with values.
 		$array = $causesrisks;
 		if (isset($array) && CostbenefitprojectionHelper::checkArray($array))
 		{
@@ -384,21 +384,21 @@ class CostbenefitprojectionModelPublicresults extends JModelItem
 			return false;
 		}
 
-		// [2808] Reset the query using our newly populated query object.
+		// [2889] Reset the query using our newly populated query object.
 		$db->setQuery($query);
 		$db->execute();
 
-		// [2811] check if there was data returned
+		// [2892] check if there was data returned
 		if ($db->getNumRows())
 		{
 			$items = $db->loadObjectList();
 
-			// [2864] Convert the parameter fields into objects.
+			// [2945] Convert the parameter fields into objects.
 			foreach ($items as $nr => &$item)
 			{
-				// [2037] Make sure the content prepare plugins fire on description.
+				// [2118] Make sure the content prepare plugins fire on description.
 				$item->description = JHtml::_('content.prepare',$item->description);
-				// [2039] Checking if description has uikit components that must be loaded.
+				// [2120] 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/scaling_factor.php b/site/models/scaling_factor.php
index da65c771..ca882aae 100644
--- a/site/models/scaling_factor.php
+++ b/site/models/scaling_factor.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		scaling_factor.php
@@ -110,7 +110,7 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 	 * @since   1.6
 	 */
 	public function getForm($data = array(), $loadData = true)
-	{		// [9651] Get the form.
+	{		// [9818] 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;
 
-		// [9736] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first.
+		// [9903] 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');
 		}
-		// [9741] The back end uses id so we use that the rest of the time and set it to 0 by default.
+		// [9908] 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();
 
-		// [9747] Check for existing item.
-		// [9748] Modify the form based on Edit State access controls.
+		// [9914] Check for existing item.
+		// [9915] 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')))
 		{
-			// [9761] Disable fields for display.
+			// [9928] Disable fields for display.
 			$form->setFieldAttribute('ordering', 'disabled', 'true');
 			$form->setFieldAttribute('published', 'disabled', 'true');
-			// [9764] Disable fields while saving.
+			// [9931] Disable fields while saving.
 			$form->setFieldAttribute('ordering', 'filter', 'unset');
 			$form->setFieldAttribute('published', 'filter', 'unset');
 		}
-		// [9769] Modify the form based on Edit Creaded By access controls.
+		// [9936] Modify the form based on Edit Creaded By access controls.
 		if (!$user->authorise('core.edit.created_by', 'com_costbenefitprojection'))
 		{
-			// [9781] Disable fields for display.
+			// [9948] Disable fields for display.
 			$form->setFieldAttribute('created_by', 'disabled', 'true');
-			// [9783] Disable fields for display.
+			// [9950] Disable fields for display.
 			$form->setFieldAttribute('created_by', 'readonly', 'true');
-			// [9785] Disable fields while saving.
+			// [9952] Disable fields while saving.
 			$form->setFieldAttribute('created_by', 'filter', 'unset');
 		}
-		// [9788] Modify the form based on Edit Creaded Date access controls.
+		// [9955] Modify the form based on Edit Creaded Date access controls.
 		if (!$user->authorise('core.edit.created', 'com_costbenefitprojection'))
 		{
-			// [9800] Disable fields for display.
+			// [9967] Disable fields for display.
 			$form->setFieldAttribute('created', 'disabled', 'true');
-			// [9802] Disable fields while saving.
+			// [9969] Disable fields while saving.
 			$form->setFieldAttribute('created', 'filter', 'unset');
 		}
 
@@ -196,7 +196,7 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 			}
 
 			$user = JFactory::getUser();
-			// [9952] The record has been set. Check the record permissions.
+			// [10119] 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)
 		{
-			// [10039] The record has been set. Check the record permissions.
+			// [10206] 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;
 			}
 		}
-		// [10056] In the absense of better information, revert to the component permissions.
+		// [10223] 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')
 	{
-		// [9864] Check specific edit permission then general edit permission.
+		// [10031] 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))
 		{
-			// [5015] Set some needed variables.
+			// [5179] 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
 			}
 		}
 
-		// [5035] get list of uniqe fields
+		// [5199] get list of uniqe fields
 		$uniqeFields = $this->getUniqeFields();
-		// [5037] remove move_copy from array
+		// [5201] remove move_copy from array
 		unset($values['move_copy']);
 
-		// [5040] make sure published is set
+		// [5204] make sure published is set
 		if (!isset($values['published']))
 		{
 			$values['published'] = 0;
@@ -518,21 +518,21 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 
 		$newIds = array();
 
-		// [5077] Parent exists so let's proceed
+		// [5241] Parent exists so let's proceed
 		while (!empty($pks))
 		{
-			// [5080] Pop the first ID off the stack
+			// [5244] Pop the first ID off the stack
 			$pk = array_shift($pks);
 
 			$this->table->reset();
 
-			// [5085] only allow copy if user may edit this item.
+			// [5249] only allow copy if user may edit this item.
 
 			if (!$this->user->authorise('scaling_factor.edit', $contexts[$pk]))
 
 			{
 
-				// [5095] Not fatal error
+				// [5259] 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
 
 			}
 
-			// [5100] Check that the row actually exists
+			// [5264] Check that the row actually exists
 			if (!$this->table->load($pk))
 			{
 				if ($error = $this->table->getError())
 				{
-					// [5105] Fatal error
+					// [5269] Fatal error
 					$this->setError($error);
 
 					return false;
 				}
 				else
 				{
-					// [5112] Not fatal error
+					// [5276] 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);
 
-			// [5148] insert all set values
+			// [5312] insert all set values
 			if (CostbenefitprojectionHelper::checkArray($values))
 			{
 				foreach ($values as $key => $value)
@@ -572,7 +572,7 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 				}
 			}
 
-			// [5160] update all uniqe fields
+			// [5324] update all uniqe fields
 			if (CostbenefitprojectionHelper::checkArray($uniqeFields))
 			{
 				foreach ($uniqeFields as $uniqeField)
@@ -581,13 +581,13 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 				}
 			}
 
-			// [5169] Reset the ID because we are making a copy
+			// [5333] Reset the ID because we are making a copy
 			$this->table->id = 0;
 
-			// [5172] TODO: Deal with ordering?
-			// [5173] $this->table->ordering	= 1;
+			// [5336] TODO: Deal with ordering?
+			// [5337] $this->table->ordering	= 1;
 
-			// [5175] Check the row.
+			// [5339] 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);
 			}
 
-			// [5188] Store the row.
+			// [5352] Store the row.
 			if (!$this->table->store())
 			{
 				$this->setError($this->table->getError());
@@ -608,14 +608,14 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 				return false;
 			}
 
-			// [5196] Get the new item ID
+			// [5360] Get the new item ID
 			$newId = $this->table->get('id');
 
-			// [5199] Add the new ID to the array
+			// [5363] Add the new ID to the array
 			$newIds[$pk] = $newId;
 		}
 
-		// [5203] Clean the cache
+		// [5367] Clean the cache
 		$this->cleanCache();
 
 		return $newIds;
@@ -636,7 +636,7 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 	{
 		if (empty($this->batchSet))
 		{
-			// [4817] Set some needed variables.
+			// [4981] 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
 			}
 		}
 
-		// [4839] make sure published only updates if user has the permission.
+		// [5003] make sure published only updates if user has the permission.
 		if (isset($values['published']) && !$this->canDo->get('scaling_factor.edit.state'))
 		{
 			unset($values['published']);
 		}
-		// [4852] remove move_copy from array
+		// [5016] remove move_copy from array
 		unset($values['move_copy']);
 
-		// [4873] Parent exists so we proceed
+		// [5037] 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;
 			}
 
-			// [4890] Check that the row actually exists
+			// [5054] Check that the row actually exists
 			if (!$this->table->load($pk))
 			{
 				if ($error = $this->table->getError())
 				{
-					// [4895] Fatal error
+					// [5059] Fatal error
 					$this->setError($error);
 
 					return false;
 				}
 				else
 				{
-					// [4902] Not fatal error
+					// [5066] Not fatal error
 					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
 					continue;
 				}
 			}
 
-			// [4908] insert all set values.
+			// [5072] insert all set values.
 			if (CostbenefitprojectionHelper::checkArray($values))
 			{
 				foreach ($values as $key => $value)
 				{
-					// [4913] Do special action for access.
+					// [5077] Do special action for access.
 					if ('access' == $key && strlen($value) > 0)
 					{
 						$this->table->$key = $value;
@@ -735,7 +735,7 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 			}
 
 
-			// [4925] Check the row.
+			// [5089] 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);
 			}
 
-			// [4938] Store the row.
+			// [5102] Store the row.
 			if (!$this->table->store())
 			{
 				$this->setError($this->table->getError());
@@ -757,7 +757,7 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 			}
 		}
 
-		// [4947] Clean the cache
+		// [5111] Clean the cache
 		$this->cleanCache();
 
 		return true;
@@ -795,10 +795,10 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
 			$data['params'] = (string) $params;
 		}
 
-		// [5295] Alter the uniqe field for save as copy
+		// [5459] Alter the uniqe field for save as copy
 		if ($input->get('task') == 'save2copy')
 		{
-			// [5298] Automatic handling of other uniqe fields
+			// [5462] 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)
 	{
 
-		// [5353] Alter the title
+		// [5517] Alter the title
 		$table = $this->getTable();
 
 		while ($table->load(array('title' => $title)))
diff --git a/site/router.php b/site/router.php
index 74eafef1..824b6979 100644
--- a/site/router.php
+++ b/site/router.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		router.php
diff --git a/site/views/combinedresults/tmpl/default.php b/site/views/combinedresults/tmpl/default.php
index 33ce0cce..365e841d 100644
--- a/site/views/combinedresults/tmpl/default.php
+++ b/site/views/combinedresults/tmpl/default.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default.php
diff --git a/site/views/combinedresults/tmpl/default_chart_cost.php b/site/views/combinedresults/tmpl/default_chart_cost.php
index 9699cf03..1ad5028f 100644
--- a/site/views/combinedresults/tmpl/default_chart_cost.php
+++ b/site/views/combinedresults/tmpl/default_chart_cost.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_cost.php
diff --git a/site/views/combinedresults/tmpl/default_chart_cost_percent.php b/site/views/combinedresults/tmpl/default_chart_cost_percent.php
index c6c38627..4492521d 100644
--- a/site/views/combinedresults/tmpl/default_chart_cost_percent.php
+++ b/site/views/combinedresults/tmpl/default_chart_cost_percent.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_cost_percent.php
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 4ed8e06c..fae2a4c2 100644
--- a/site/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php
+++ b/site/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_intervention_cost_benefit.php
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 c56270cc..7efd0430 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
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_intervention_cost_benefit_save.php
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 02a74032..6593e348 100644
--- a/site/views/combinedresults/tmpl/default_chart_work_days_lost.php
+++ b/site/views/combinedresults/tmpl/default_chart_work_days_lost.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_work_days_lost.php
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 52160be9..5beb4703 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
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_work_days_lost_percent.php
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 adeb42d5..7fb1ba3d 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
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_table_calculated_cost_in_detail.php
diff --git a/site/views/combinedresults/tmpl/default_table_cost_summary.php b/site/views/combinedresults/tmpl/default_table_cost_summary.php
index c83c0270..96366a0f 100644
--- a/site/views/combinedresults/tmpl/default_table_cost_summary.php
+++ b/site/views/combinedresults/tmpl/default_table_cost_summary.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_table_cost_summary.php
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 d413eaac..c611e0e6 100644
--- a/site/views/combinedresults/tmpl/default_table_intervention_net_benefit.php
+++ b/site/views/combinedresults/tmpl/default_table_intervention_net_benefit.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_table_intervention_net_benefit.php
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 812c5844..4ed352ea 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
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_table_work_days_lost_summary.php
diff --git a/site/views/combinedresults/view.html.php b/site/views/combinedresults/view.html.php
index 70cfbc1a..6bf7f021 100644
--- a/site/views/combinedresults/view.html.php
+++ b/site/views/combinedresults/view.html.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
@@ -37,10 +37,10 @@ class CostbenefitprojectionViewCombinedresults extends JViewLegacy
 		$this->menu = $this->app->getMenu()->getActive();
 		// get the user object
 		$this->user = JFactory::getUser();
-		// [3083] Initialise variables.
+		// [3164] Initialise variables.
 		$this->items	= $this->get('Items');
 
-		// [3112] Check for errors.
+		// [3193] 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 = '';
 		}
 
-		// [3129] Set the toolbar
+		// [3210] Set the toolbar
 		$this->addToolBar();
 
-		// [3131] set the document
+		// [3212] set the document
 		$this->_prepareDocument();
 
 		parent::display($tpl);
@@ -81,80 +81,80 @@ class CostbenefitprojectionViewCombinedresults extends JViewLegacy
 	protected function _prepareDocument()
 	{
 
-		// [3485] always make sure jquery is loaded.
+		// [3566] always make sure jquery is loaded.
 		JHtml::_('jquery.framework');
-		// [3487] Load the header checker class.
+		// [3568] Load the header checker class.
 		require_once( JPATH_COMPONENT_SITE.'/helpers/headercheck.php' );
-		// [3489] Initialize the header checker.
+		// [3570] Initialize the header checker.
 		$HeaderCheck = new HeaderCheck;
 
-		// [3494] Load uikit options.
+		// [3575] Load uikit options.
 		$uikit = $this->params->get('uikit_load');
-		// [3496] Set script size.
+		// [3577] Set script size.
 		$size = $this->params->get('uikit_min');
-		// [3498] Set css style.
+		// [3579] Set css style.
 		$style = $this->params->get('uikit_style');
 
-		// [3501] The uikit css.
+		// [3582] 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');
 		}
-		// [3506] The uikit js.
+		// [3587] 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');
 		}
 
-		// [3571] Load the needed uikit components in this view.
+		// [3652] Load the needed uikit components in this view.
 		$uikitComp = $this->get('UikitComp');
 		if ($uikit != 2 && isset($uikitComp) && CostbenefitprojectionHelper::checkArray($uikitComp))
 		{
-			// [3575] load just in case.
+			// [3656] load just in case.
 			jimport('joomla.filesystem.file');
-			// [3577] loading...
+			// [3658] loading...
 			foreach ($uikitComp as $class)
 			{
 				foreach (CostbenefitprojectionHelper::$uk_components[$class] as $name)
 				{
-					// [3582] check if the CSS file exists.
+					// [3663] check if the CSS file exists.
 					if (JFile::exists(JPATH_ROOT.'/media/com_costbenefitprojection/uikit/css/components/'.$name.$style.$size.'.css'))
 					{
-						// [3585] load the css.
+						// [3666] load the css.
 						$this->document->addStyleSheet(JURI::root(true) .'/media/com_costbenefitprojection/uikit/css/components/'.$name.$style.$size.'.css');
 					}
-					// [3588] check if the JavaScript file exists.
+					// [3669] check if the JavaScript file exists.
 					if (JFile::exists(JPATH_ROOT.'/media/com_costbenefitprojection/uikit/js/components/'.$name.$size.'.js'))
 					{
-						// [3591] load the js.
+						// [3672] load the js.
 						$this->document->addScript(JURI::root(true) .'/media/com_costbenefitprojection/uikit/js/components/'.$name.$size.'.js');
 					}
 				}
 			}
 		} 
 
-		// [3467] add the google chart builder class.
+		// [3548] add the google chart builder class.
 		require_once JPATH_COMPONENT_ADMINISTRATOR.'/helpers/chartbuilder.php';
-		// [3469] load the google chart js.
+		// [3550] 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'); 
 
-		// [6599] Add the CSS for Footable.
+		// [6766] Add the CSS for Footable.
 		$this->document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable/css/footable.core.min.css');
 
-		// [6601] Use the Metro Style
+		// [6768] 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');
 		}
-		// [6606] Use the Legacy Style.
+		// [6773] 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');
 		}
 
-		// [6611] Add the JavaScript for Footable
+		// [6778] 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 ac51d066..e3d758d4 100644
--- a/site/views/company/submitbutton.js
+++ b/site/views/company/submitbutton.js
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		submitbutton.js
diff --git a/site/views/company/tmpl/edit.php b/site/views/company/tmpl/edit.php
index f2eb9912..f4f61201 100644
--- a/site/views/company/tmpl/edit.php
+++ b/site/views/company/tmpl/edit.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		edit.php
@@ -137,33 +137,33 @@ $componentParams = JComponentHelper::getParams('com_costbenefitprojection');
 
 <script type="text/javascript">
 
-// #jform_department listeners for department_FemBBLx function
+// #jform_department listeners for department_bETABWB function
 jQuery('#jform_department').on('keyup',function()
 {
-	var department_FemBBLx = jQuery("#jform_department input[type='radio']:checked").val();
-	FemBBLx(department_FemBBLx);
+	var department_bETABWB = jQuery("#jform_department input[type='radio']:checked").val();
+	bETABWB(department_bETABWB);
 
 });
 jQuery('#adminForm').on('change', '#jform_department',function (e)
 {
 	e.preventDefault();
-	var department_FemBBLx = jQuery("#jform_department input[type='radio']:checked").val();
-	FemBBLx(department_FemBBLx);
+	var department_bETABWB = jQuery("#jform_department input[type='radio']:checked").val();
+	bETABWB(department_bETABWB);
 
 });
 
-// #jform_department listeners for department_kUrQZMs function
+// #jform_department listeners for department_RkgSPam function
 jQuery('#jform_department').on('keyup',function()
 {
-	var department_kUrQZMs = jQuery("#jform_department input[type='radio']:checked").val();
-	kUrQZMs(department_kUrQZMs);
+	var department_RkgSPam = jQuery("#jform_department input[type='radio']:checked").val();
+	RkgSPam(department_RkgSPam);
 
 });
 jQuery('#adminForm').on('change', '#jform_department',function (e)
 {
 	e.preventDefault();
-	var department_kUrQZMs = jQuery("#jform_department input[type='radio']:checked").val();
-	kUrQZMs(department_kUrQZMs);
+	var department_RkgSPam = jQuery("#jform_department input[type='radio']:checked").val();
+	RkgSPam(department_RkgSPam);
 
 });
 
diff --git a/site/views/company/view.html.php b/site/views/company/view.html.php
index 2b062987..19f3f46f 100644
--- a/site/views/company/view.html.php
+++ b/site/views/company/view.html.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
@@ -64,11 +64,11 @@ class CostbenefitprojectionViewCompany extends JViewLegacy
                         $this->referral = '&ref='.(string)$this->ref;
                 }
 
-		// [6564] Get Linked view data
-		$this->bqlscaling_factors		= $this->get('Bqlscaling_factors');
+		// [6731] Get Linked view data
+		$this->rxjscaling_factors		= $this->get('Rxjscaling_factors');
 
-		// [6564] Get Linked view data
-		$this->ynainterventions		= $this->get('Ynainterventions');
+		// [6731] Get Linked view data
+		$this->wrkinterventions		= $this->get('Wrkinterventions');
 
 		// 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');
-		// [10354] Built the actions for new and existing records.
+		// [10525] Built the actions for new and existing records.
 		if ($this->refid || $this->ref)
 		{
 			if ($this->canDo->get('company.create') && $isNew)
 			{
-				// [10366] We can create the record.
+				// [10537] We can create the record.
 				JToolBarHelper::save('company.save', 'JTOOLBAR_SAVE');
 			}
 			elseif ($this->canDo->get('company.edit'))
 			{
-				// [10378] We can save the record.
+				// [10549] We can save the record.
 				JToolBarHelper::save('company.save', 'JTOOLBAR_SAVE');
 			}
 			if ($isNew)
 			{
-				// [10383] Do not creat but cancel.
+				// [10554] Do not creat but cancel.
 				JToolBarHelper::cancel('company.cancel', 'JTOOLBAR_CANCEL');
 			}
 			else
 			{
-				// [10388] We can close it.
+				// [10559] We can close it.
 				JToolBarHelper::cancel('company.cancel', 'JTOOLBAR_CLOSE');
 			}
 		}
@@ -122,7 +122,7 @@ class CostbenefitprojectionViewCompany extends JViewLegacy
 		{
 			if ($isNew)
 			{
-				// [10396] For new records, check the create permission.
+				// [10567] 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'))
 				{
-					// [10423] We can save the new record
+					// [10594] We can save the new record
 					JToolBarHelper::apply('company.apply', 'JTOOLBAR_APPLY');
 					JToolBarHelper::save('company.save', 'JTOOLBAR_SAVE');
-					// [10426] We can save this record, but check the create permission to see
-					// [10427] if we can return to make a new one.
+					// [10597] We can save this record, but check the create permission to see
+					// [10598] 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();
-		// [10463] set help url for this view if found
+		// [10634] 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"); 
 
-		// [6599] Add the CSS for Footable.
+		// [6766] Add the CSS for Footable.
 		$document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable/css/footable.core.min.css');
 
-		// [6601] Use the Metro Style
+		// [6768] Use the Metro Style
 		if (!isset($this->fooTableStyle) || 0 == $this->fooTableStyle)
 		{
 			$document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable/css/footable.metro.min.css');
 		}
-		// [6606] Use the Legacy Style.
+		// [6773] Use the Legacy Style.
 		elseif (isset($this->fooTableStyle) && 1 == $this->fooTableStyle)
 		{
 			$document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable/css/footable.standalone.min.css');
 		}
 
-		// [6611] Add the JavaScript for Footable
+		// [6778] 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 e024367c..cd235729 100644
--- a/site/views/companyresults/tmpl/default.php
+++ b/site/views/companyresults/tmpl/default.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default.php
diff --git a/site/views/companyresults/tmpl/default_chart_cost.php b/site/views/companyresults/tmpl/default_chart_cost.php
index 9699cf03..1ad5028f 100644
--- a/site/views/companyresults/tmpl/default_chart_cost.php
+++ b/site/views/companyresults/tmpl/default_chart_cost.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_cost.php
diff --git a/site/views/companyresults/tmpl/default_chart_cost_percent.php b/site/views/companyresults/tmpl/default_chart_cost_percent.php
index c6c38627..4492521d 100644
--- a/site/views/companyresults/tmpl/default_chart_cost_percent.php
+++ b/site/views/companyresults/tmpl/default_chart_cost_percent.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_cost_percent.php
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 4ed8e06c..fae2a4c2 100644
--- a/site/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php
+++ b/site/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_intervention_cost_benefit.php
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 c56270cc..7efd0430 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
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_intervention_cost_benefit_save.php
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 02a74032..6593e348 100644
--- a/site/views/companyresults/tmpl/default_chart_work_days_lost.php
+++ b/site/views/companyresults/tmpl/default_chart_work_days_lost.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_work_days_lost.php
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 52160be9..5beb4703 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
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_work_days_lost_percent.php
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 adeb42d5..7fb1ba3d 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
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_table_calculated_cost_in_detail.php
diff --git a/site/views/companyresults/tmpl/default_table_cost_summary.php b/site/views/companyresults/tmpl/default_table_cost_summary.php
index c83c0270..96366a0f 100644
--- a/site/views/companyresults/tmpl/default_table_cost_summary.php
+++ b/site/views/companyresults/tmpl/default_table_cost_summary.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_table_cost_summary.php
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 d413eaac..c611e0e6 100644
--- a/site/views/companyresults/tmpl/default_table_intervention_net_benefit.php
+++ b/site/views/companyresults/tmpl/default_table_intervention_net_benefit.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_table_intervention_net_benefit.php
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 812c5844..4ed352ea 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
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_table_work_days_lost_summary.php
diff --git a/site/views/companyresults/view.html.php b/site/views/companyresults/view.html.php
index 682ce4ab..bbe12daf 100644
--- a/site/views/companyresults/view.html.php
+++ b/site/views/companyresults/view.html.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
@@ -37,10 +37,10 @@ class CostbenefitprojectionViewCompanyresults extends JViewLegacy
 		$this->menu = $this->app->getMenu()->getActive();
 		// get the user object
 		$this->user = JFactory::getUser();
-		// [3077] Initialise variables.
+		// [3158] Initialise variables.
 		$this->item	= $this->get('Item');
 
-		// [3112] Check for errors.
+		// [3193] 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;
 		}
 
-		// [3129] Set the toolbar
+		// [3210] Set the toolbar
 		$this->addToolBar();
 
-		// [3131] set the document
+		// [3212] set the document
 		$this->_prepareDocument();
 
 		parent::display($tpl);
@@ -74,80 +74,80 @@ class CostbenefitprojectionViewCompanyresults extends JViewLegacy
 	protected function _prepareDocument()
 	{
 
-		// [3485] always make sure jquery is loaded.
+		// [3566] always make sure jquery is loaded.
 		JHtml::_('jquery.framework');
-		// [3487] Load the header checker class.
+		// [3568] Load the header checker class.
 		require_once( JPATH_COMPONENT_SITE.'/helpers/headercheck.php' );
-		// [3489] Initialize the header checker.
+		// [3570] Initialize the header checker.
 		$HeaderCheck = new HeaderCheck;
 
-		// [3494] Load uikit options.
+		// [3575] Load uikit options.
 		$uikit = $this->params->get('uikit_load');
-		// [3496] Set script size.
+		// [3577] Set script size.
 		$size = $this->params->get('uikit_min');
-		// [3498] Set css style.
+		// [3579] Set css style.
 		$style = $this->params->get('uikit_style');
 
-		// [3501] The uikit css.
+		// [3582] 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');
 		}
-		// [3506] The uikit js.
+		// [3587] 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');
 		}
 
-		// [3571] Load the needed uikit components in this view.
+		// [3652] Load the needed uikit components in this view.
 		$uikitComp = $this->get('UikitComp');
 		if ($uikit != 2 && isset($uikitComp) && CostbenefitprojectionHelper::checkArray($uikitComp))
 		{
-			// [3575] load just in case.
+			// [3656] load just in case.
 			jimport('joomla.filesystem.file');
-			// [3577] loading...
+			// [3658] loading...
 			foreach ($uikitComp as $class)
 			{
 				foreach (CostbenefitprojectionHelper::$uk_components[$class] as $name)
 				{
-					// [3582] check if the CSS file exists.
+					// [3663] check if the CSS file exists.
 					if (JFile::exists(JPATH_ROOT.'/media/com_costbenefitprojection/uikit/css/components/'.$name.$style.$size.'.css'))
 					{
-						// [3585] load the css.
+						// [3666] load the css.
 						$this->document->addStyleSheet(JURI::root(true) .'/media/com_costbenefitprojection/uikit/css/components/'.$name.$style.$size.'.css');
 					}
-					// [3588] check if the JavaScript file exists.
+					// [3669] check if the JavaScript file exists.
 					if (JFile::exists(JPATH_ROOT.'/media/com_costbenefitprojection/uikit/js/components/'.$name.$size.'.js'))
 					{
-						// [3591] load the js.
+						// [3672] load the js.
 						$this->document->addScript(JURI::root(true) .'/media/com_costbenefitprojection/uikit/js/components/'.$name.$size.'.js');
 					}
 				}
 			}
 		} 
 
-		// [3467] add the google chart builder class.
+		// [3548] add the google chart builder class.
 		require_once JPATH_COMPONENT_ADMINISTRATOR.'/helpers/chartbuilder.php';
-		// [3469] load the google chart js.
+		// [3550] 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'); 
 
-		// [6599] Add the CSS for Footable.
+		// [6766] Add the CSS for Footable.
 		$this->document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable/css/footable.core.min.css');
 
-		// [6601] Use the Metro Style
+		// [6768] 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');
 		}
-		// [6606] Use the Legacy Style.
+		// [6773] 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');
 		}
 
-		// [6611] Add the JavaScript for Footable
+		// [6778] 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 ed62addd..357e4435 100644
--- a/site/views/cpanel/tmpl/default.php
+++ b/site/views/cpanel/tmpl/default.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default.php
diff --git a/site/views/cpanel/view.html.php b/site/views/cpanel/view.html.php
index b4f635ce..25786123 100644
--- a/site/views/cpanel/view.html.php
+++ b/site/views/cpanel/view.html.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
@@ -37,20 +37,20 @@ class CostbenefitprojectionViewCpanel extends JViewLegacy
 		$this->menu = $this->app->getMenu()->getActive();
 		// get the user object
 		$this->user = JFactory::getUser();
-		// [3083] Initialise variables.
+		// [3164] Initialise variables.
 		$this->items	= $this->get('Items');
 
-		// [3112] Check for errors.
+		// [3193] Check for errors.
 		if (count($errors = $this->get('Errors')))
 		{
 			JError::raiseWarning(500, implode("\n", $errors));
 			return false;
 		}
 
-		// [3129] Set the toolbar
+		// [3210] Set the toolbar
 		$this->addToolBar();
 
-		// [3131] set the document
+		// [3212] set the document
 		$this->_prepareDocument();
 
 		parent::display($tpl);
@@ -62,42 +62,42 @@ class CostbenefitprojectionViewCpanel extends JViewLegacy
 	protected function _prepareDocument()
 	{
 
-		// [3485] always make sure jquery is loaded.
+		// [3566] always make sure jquery is loaded.
 		JHtml::_('jquery.framework');
-		// [3487] Load the header checker class.
+		// [3568] Load the header checker class.
 		require_once( JPATH_COMPONENT_SITE.'/helpers/headercheck.php' );
-		// [3489] Initialize the header checker.
+		// [3570] Initialize the header checker.
 		$HeaderCheck = new HeaderCheck;
 
-		// [3494] Load uikit options.
+		// [3575] Load uikit options.
 		$uikit = $this->params->get('uikit_load');
-		// [3496] Set script size.
+		// [3577] Set script size.
 		$size = $this->params->get('uikit_min');
-		// [3498] Set css style.
+		// [3579] Set css style.
 		$style = $this->params->get('uikit_style');
 
-		// [3501] The uikit css.
+		// [3582] 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');
 		}
-		// [3506] The uikit js.
+		// [3587] 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');
 		}
 
-		// [3515] Load the script to find all uikit components needed.
+		// [3596] Load the script to find all uikit components needed.
 		if ($uikit != 2)
 		{
-			// [3518] Set the default uikit components in this view.
+			// [3599] 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';
 
-			// [3527] Get field uikit components needed in this view.
+			// [3608] 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
 			}
 		}
 
-		// [3543] Load the needed uikit components in this view.
+		// [3624] Load the needed uikit components in this view.
 		if ($uikit != 2 && isset($uikitComp) && CostbenefitprojectionHelper::checkArray($uikitComp))
 		{
-			// [3546] load just in case.
+			// [3627] load just in case.
 			jimport('joomla.filesystem.file');
-			// [3548] loading...
+			// [3629] loading...
 			foreach ($uikitComp as $class)
 			{
 				foreach (CostbenefitprojectionHelper::$uk_components[$class] as $name)
 				{
-					// [3553] check if the CSS file exists.
+					// [3634] check if the CSS file exists.
 					if (JFile::exists(JPATH_ROOT.'/media/com_costbenefitprojection/uikit/css/components/'.$name.$style.$size.'.css'))
 					{
-						// [3556] load the css.
+						// [3637] load the css.
 						$this->document->addStyleSheet(JURI::root(true) .'/media/com_costbenefitprojection/uikit/css/components/'.$name.$style.$size.'.css');
 					}
-					// [3559] check if the JavaScript file exists.
+					// [3640] check if the JavaScript file exists.
 					if (JFile::exists(JPATH_ROOT.'/media/com_costbenefitprojection/uikit/js/components/'.$name.$size.'.js'))
 					{
-						// [3562] load the js.
+						// [3643] load the js.
 						$this->document->addScript(JURI::root(true) .'/media/com_costbenefitprojection/uikit/js/components/'.$name.$size.'.js');
 					}
 				}
 			}
 		} 
 
-		// [3467] add the google chart builder class.
+		// [3548] add the google chart builder class.
 		require_once JPATH_COMPONENT_ADMINISTRATOR.'/helpers/chartbuilder.php';
-		// [3469] load the google chart js.
+		// [3550] 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'); 
 
-		// [6599] Add the CSS for Footable.
+		// [6766] Add the CSS for Footable.
 		$this->document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable/css/footable.core.min.css');
 
-		// [6601] Use the Metro Style
+		// [6768] 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');
 		}
-		// [6606] Use the Legacy Style.
+		// [6773] 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');
 		}
 
-		// [6611] Add the JavaScript for Footable
+		// [6778] 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'); 
-		// [3443] load the meta description
+		// [3524] load the meta description
 		if ($this->params->get('menu-meta_description'))
 		{
 			$this->document->setDescription($this->params->get('menu-meta_description'));
 		}
-		// [3448] load the key words if set
+		// [3529] load the key words if set
 		if ($this->params->get('menu-meta_keywords'))
 		{
 			$this->document->setMetadata('keywords', $this->params->get('menu-meta_keywords'));
 		}
-		// [3453] check the robot params
+		// [3534] 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 a583fcd4..6e6725e0 100644
--- a/site/views/createaccount/tmpl/default.php
+++ b/site/views/createaccount/tmpl/default.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default.php
diff --git a/site/views/createaccount/view.html.php b/site/views/createaccount/view.html.php
index 65950f8a..dcb7dbee 100644
--- a/site/views/createaccount/view.html.php
+++ b/site/views/createaccount/view.html.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
@@ -37,20 +37,20 @@ class CostbenefitprojectionViewCreateaccount extends JViewLegacy
 		$this->menu = $this->app->getMenu()->getActive();
 		// get the user object
 		$this->user = JFactory::getUser();
-		// [3083] Initialise variables.
+		// [3164] Initialise variables.
 		$this->items	= $this->get('Items');
 
-		// [3112] Check for errors.
+		// [3193] Check for errors.
 		if (count($errors = $this->get('Errors')))
 		{
 			JError::raiseWarning(500, implode("\n", $errors));
 			return false;
 		}
 
-		// [3129] Set the toolbar
+		// [3210] Set the toolbar
 		$this->addToolBar();
 
-		// [3131] set the document
+		// [3212] set the document
 		$this->_prepareDocument();
 
 		parent::display($tpl);
@@ -101,40 +101,40 @@ class CostbenefitprojectionViewCreateaccount extends JViewLegacy
 	protected function _prepareDocument()
 	{
 
-		// [3485] always make sure jquery is loaded.
+		// [3566] always make sure jquery is loaded.
 		JHtml::_('jquery.framework');
-		// [3487] Load the header checker class.
+		// [3568] Load the header checker class.
 		require_once( JPATH_COMPONENT_SITE.'/helpers/headercheck.php' );
-		// [3489] Initialize the header checker.
+		// [3570] Initialize the header checker.
 		$HeaderCheck = new HeaderCheck;
 
-		// [3494] Load uikit options.
+		// [3575] Load uikit options.
 		$uikit = $this->params->get('uikit_load');
-		// [3496] Set script size.
+		// [3577] Set script size.
 		$size = $this->params->get('uikit_min');
-		// [3498] Set css style.
+		// [3579] Set css style.
 		$style = $this->params->get('uikit_style');
 
-		// [3501] The uikit css.
+		// [3582] 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');
 		}
-		// [3506] The uikit js.
+		// [3587] 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');
 		}
 
-		// [3515] Load the script to find all uikit components needed.
+		// [3596] Load the script to find all uikit components needed.
 		if ($uikit != 2)
 		{
-			// [3518] Set the default uikit components in this view.
+			// [3599] Set the default uikit components in this view.
 			$uikitComp = array();
 			$uikitComp[] = 'uk-accordion';
 			$uikitComp[] = 'data-uk-grid';
 
-			// [3527] Get field uikit components needed in this view.
+			// [3608] Get field uikit components needed in this view.
 			$uikitFieldComp = $this->get('UikitComp');
 			if (isset($uikitFieldComp) && CostbenefitprojectionHelper::checkArray($uikitFieldComp))
 			{
@@ -150,26 +150,26 @@ class CostbenefitprojectionViewCreateaccount extends JViewLegacy
 			}
 		}
 
-		// [3543] Load the needed uikit components in this view.
+		// [3624] Load the needed uikit components in this view.
 		if ($uikit != 2 && isset($uikitComp) && CostbenefitprojectionHelper::checkArray($uikitComp))
 		{
-			// [3546] load just in case.
+			// [3627] load just in case.
 			jimport('joomla.filesystem.file');
-			// [3548] loading...
+			// [3629] loading...
 			foreach ($uikitComp as $class)
 			{
 				foreach (CostbenefitprojectionHelper::$uk_components[$class] as $name)
 				{
-					// [3553] check if the CSS file exists.
+					// [3634] check if the CSS file exists.
 					if (JFile::exists(JPATH_ROOT.'/media/com_costbenefitprojection/uikit/css/components/'.$name.$style.$size.'.css'))
 					{
-						// [3556] load the css.
+						// [3637] load the css.
 						$this->document->addStyleSheet(JURI::root(true) .'/media/com_costbenefitprojection/uikit/css/components/'.$name.$style.$size.'.css');
 					}
-					// [3559] check if the JavaScript file exists.
+					// [3640] check if the JavaScript file exists.
 					if (JFile::exists(JPATH_ROOT.'/media/com_costbenefitprojection/uikit/js/components/'.$name.$size.'.js'))
 					{
-						// [3562] load the js.
+						// [3643] 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 c812838a..28bc37e3 100644
--- a/site/views/intervention/submitbutton.js
+++ b/site/views/intervention/submitbutton.js
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		submitbutton.js
diff --git a/site/views/intervention/tmpl/edit.php b/site/views/intervention/tmpl/edit.php
index a46492cc..1970cb1c 100644
--- a/site/views/intervention/tmpl/edit.php
+++ b/site/views/intervention/tmpl/edit.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		edit.php
@@ -103,33 +103,33 @@ $componentParams = JComponentHelper::getParams('com_costbenefitprojection');
 
 <script type="text/javascript">
 
-// #jform_type listeners for type_hhqVuoH function
+// #jform_type listeners for type_JxOMJHD function
 jQuery('#jform_type').on('keyup',function()
 {
-	var type_hhqVuoH = jQuery("#jform_type input[type='radio']:checked").val();
-	hhqVuoH(type_hhqVuoH);
+	var type_JxOMJHD = jQuery("#jform_type input[type='radio']:checked").val();
+	JxOMJHD(type_JxOMJHD);
 
 });
 jQuery('#adminForm').on('change', '#jform_type',function (e)
 {
 	e.preventDefault();
-	var type_hhqVuoH = jQuery("#jform_type input[type='radio']:checked").val();
-	hhqVuoH(type_hhqVuoH);
+	var type_JxOMJHD = jQuery("#jform_type input[type='radio']:checked").val();
+	JxOMJHD(type_JxOMJHD);
 
 });
 
-// #jform_type listeners for type_LZHLLUr function
+// #jform_type listeners for type_SnkLovW function
 jQuery('#jform_type').on('keyup',function()
 {
-	var type_LZHLLUr = jQuery("#jform_type input[type='radio']:checked").val();
-	LZHLLUr(type_LZHLLUr);
+	var type_SnkLovW = jQuery("#jform_type input[type='radio']:checked").val();
+	SnkLovW(type_SnkLovW);
 
 });
 jQuery('#adminForm').on('change', '#jform_type',function (e)
 {
 	e.preventDefault();
-	var type_LZHLLUr = jQuery("#jform_type input[type='radio']:checked").val();
-	LZHLLUr(type_LZHLLUr);
+	var type_SnkLovW = jQuery("#jform_type input[type='radio']:checked").val();
+	SnkLovW(type_SnkLovW);
 
 });
 
diff --git a/site/views/intervention/view.html.php b/site/views/intervention/view.html.php
index b177178c..1471bdda 100644
--- a/site/views/intervention/view.html.php
+++ b/site/views/intervention/view.html.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
@@ -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');
-		// [10354] Built the actions for new and existing records.
+		// [10525] Built the actions for new and existing records.
 		if ($this->refid || $this->ref)
 		{
 			if ($this->canDo->get('intervention.create') && $isNew)
 			{
-				// [10366] We can create the record.
+				// [10537] We can create the record.
 				JToolBarHelper::save('intervention.save', 'JTOOLBAR_SAVE');
 			}
 			elseif ($this->canDo->get('intervention.edit'))
 			{
-				// [10378] We can save the record.
+				// [10549] We can save the record.
 				JToolBarHelper::save('intervention.save', 'JTOOLBAR_SAVE');
 			}
 			if ($isNew)
 			{
-				// [10383] Do not creat but cancel.
+				// [10554] Do not creat but cancel.
 				JToolBarHelper::cancel('intervention.cancel', 'JTOOLBAR_CANCEL');
 			}
 			else
 			{
-				// [10388] We can close it.
+				// [10559] We can close it.
 				JToolBarHelper::cancel('intervention.cancel', 'JTOOLBAR_CLOSE');
 			}
 		}
@@ -116,7 +116,7 @@ class CostbenefitprojectionViewIntervention extends JViewLegacy
 		{
 			if ($isNew)
 			{
-				// [10396] For new records, check the create permission.
+				// [10567] 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'))
 				{
-					// [10423] We can save the new record
+					// [10594] We can save the new record
 					JToolBarHelper::apply('intervention.apply', 'JTOOLBAR_APPLY');
 					JToolBarHelper::save('intervention.save', 'JTOOLBAR_SAVE');
-					// [10426] We can save this record, but check the create permission to see
-					// [10427] if we can return to make a new one.
+					// [10597] We can save this record, but check the create permission to see
+					// [10598] 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();
-		// [10463] set help url for this view if found
+		// [10634] 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");
-		// [8884] Add Ajax Token
+		// [9051] 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/publicresults/tmpl/default.php b/site/views/publicresults/tmpl/default.php
index e024367c..cd235729 100644
--- a/site/views/publicresults/tmpl/default.php
+++ b/site/views/publicresults/tmpl/default.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default.php
diff --git a/site/views/publicresults/tmpl/default_chart_cost.php b/site/views/publicresults/tmpl/default_chart_cost.php
index 9699cf03..1ad5028f 100644
--- a/site/views/publicresults/tmpl/default_chart_cost.php
+++ b/site/views/publicresults/tmpl/default_chart_cost.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_cost.php
diff --git a/site/views/publicresults/tmpl/default_chart_cost_percent.php b/site/views/publicresults/tmpl/default_chart_cost_percent.php
index c6c38627..4492521d 100644
--- a/site/views/publicresults/tmpl/default_chart_cost_percent.php
+++ b/site/views/publicresults/tmpl/default_chart_cost_percent.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_cost_percent.php
diff --git a/site/views/publicresults/tmpl/default_chart_intervention_cost_benefit.php b/site/views/publicresults/tmpl/default_chart_intervention_cost_benefit.php
index 4ed8e06c..fae2a4c2 100644
--- a/site/views/publicresults/tmpl/default_chart_intervention_cost_benefit.php
+++ b/site/views/publicresults/tmpl/default_chart_intervention_cost_benefit.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_intervention_cost_benefit.php
diff --git a/site/views/publicresults/tmpl/default_chart_intervention_cost_benefit_save.php b/site/views/publicresults/tmpl/default_chart_intervention_cost_benefit_save.php
index c56270cc..7efd0430 100644
--- a/site/views/publicresults/tmpl/default_chart_intervention_cost_benefit_save.php
+++ b/site/views/publicresults/tmpl/default_chart_intervention_cost_benefit_save.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_intervention_cost_benefit_save.php
diff --git a/site/views/publicresults/tmpl/default_chart_work_days_lost.php b/site/views/publicresults/tmpl/default_chart_work_days_lost.php
index 02a74032..6593e348 100644
--- a/site/views/publicresults/tmpl/default_chart_work_days_lost.php
+++ b/site/views/publicresults/tmpl/default_chart_work_days_lost.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_work_days_lost.php
diff --git a/site/views/publicresults/tmpl/default_chart_work_days_lost_percent.php b/site/views/publicresults/tmpl/default_chart_work_days_lost_percent.php
index 52160be9..5beb4703 100644
--- a/site/views/publicresults/tmpl/default_chart_work_days_lost_percent.php
+++ b/site/views/publicresults/tmpl/default_chart_work_days_lost_percent.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_work_days_lost_percent.php
diff --git a/site/views/publicresults/tmpl/default_table_calculated_cost_in_detail.php b/site/views/publicresults/tmpl/default_table_calculated_cost_in_detail.php
index adeb42d5..7fb1ba3d 100644
--- a/site/views/publicresults/tmpl/default_table_calculated_cost_in_detail.php
+++ b/site/views/publicresults/tmpl/default_table_calculated_cost_in_detail.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_table_calculated_cost_in_detail.php
diff --git a/site/views/publicresults/tmpl/default_table_cost_summary.php b/site/views/publicresults/tmpl/default_table_cost_summary.php
index c83c0270..96366a0f 100644
--- a/site/views/publicresults/tmpl/default_table_cost_summary.php
+++ b/site/views/publicresults/tmpl/default_table_cost_summary.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_table_cost_summary.php
diff --git a/site/views/publicresults/tmpl/default_table_intervention_net_benefit.php b/site/views/publicresults/tmpl/default_table_intervention_net_benefit.php
index d413eaac..c611e0e6 100644
--- a/site/views/publicresults/tmpl/default_table_intervention_net_benefit.php
+++ b/site/views/publicresults/tmpl/default_table_intervention_net_benefit.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_table_intervention_net_benefit.php
diff --git a/site/views/publicresults/tmpl/default_table_work_days_lost_summary.php b/site/views/publicresults/tmpl/default_table_work_days_lost_summary.php
index 812c5844..4ed352ea 100644
--- a/site/views/publicresults/tmpl/default_table_work_days_lost_summary.php
+++ b/site/views/publicresults/tmpl/default_table_work_days_lost_summary.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_table_work_days_lost_summary.php
diff --git a/site/views/publicresults/view.html.php b/site/views/publicresults/view.html.php
index 34673952..188e0fad 100644
--- a/site/views/publicresults/view.html.php
+++ b/site/views/publicresults/view.html.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
@@ -37,10 +37,10 @@ class CostbenefitprojectionViewPublicresults extends JViewLegacy
 		$this->menu = $this->app->getMenu()->getActive();
 		// get the user object
 		$this->user = JFactory::getUser();
-		// [3077] Initialise variables.
+		// [3158] Initialise variables.
 		$this->item	= $this->get('Item');
 
-		// [3112] Check for errors.
+		// [3193] Check for errors.
 		if (count($errors = $this->get('Errors')))
 		{
 			JError::raiseWarning(500, implode("\n", $errors));
@@ -59,10 +59,10 @@ class CostbenefitprojectionViewPublicresults extends JViewLegacy
 			$this->results = false;
 		}
 
-		// [3129] Set the toolbar
+		// [3210] Set the toolbar
 		$this->addToolBar();
 
-		// [3131] set the document
+		// [3212] set the document
 		$this->_prepareDocument();
 
 		parent::display($tpl);
@@ -74,80 +74,80 @@ class CostbenefitprojectionViewPublicresults extends JViewLegacy
 	protected function _prepareDocument()
 	{
 
-		// [3485] always make sure jquery is loaded.
+		// [3566] always make sure jquery is loaded.
 		JHtml::_('jquery.framework');
-		// [3487] Load the header checker class.
+		// [3568] Load the header checker class.
 		require_once( JPATH_COMPONENT_SITE.'/helpers/headercheck.php' );
-		// [3489] Initialize the header checker.
+		// [3570] Initialize the header checker.
 		$HeaderCheck = new HeaderCheck;
 
-		// [3494] Load uikit options.
+		// [3575] Load uikit options.
 		$uikit = $this->params->get('uikit_load');
-		// [3496] Set script size.
+		// [3577] Set script size.
 		$size = $this->params->get('uikit_min');
-		// [3498] Set css style.
+		// [3579] Set css style.
 		$style = $this->params->get('uikit_style');
 
-		// [3501] The uikit css.
+		// [3582] 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');
 		}
-		// [3506] The uikit js.
+		// [3587] 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');
 		}
 
-		// [3571] Load the needed uikit components in this view.
+		// [3652] Load the needed uikit components in this view.
 		$uikitComp = $this->get('UikitComp');
 		if ($uikit != 2 && isset($uikitComp) && CostbenefitprojectionHelper::checkArray($uikitComp))
 		{
-			// [3575] load just in case.
+			// [3656] load just in case.
 			jimport('joomla.filesystem.file');
-			// [3577] loading...
+			// [3658] loading...
 			foreach ($uikitComp as $class)
 			{
 				foreach (CostbenefitprojectionHelper::$uk_components[$class] as $name)
 				{
-					// [3582] check if the CSS file exists.
+					// [3663] check if the CSS file exists.
 					if (JFile::exists(JPATH_ROOT.'/media/com_costbenefitprojection/uikit/css/components/'.$name.$style.$size.'.css'))
 					{
-						// [3585] load the css.
+						// [3666] load the css.
 						$this->document->addStyleSheet(JURI::root(true) .'/media/com_costbenefitprojection/uikit/css/components/'.$name.$style.$size.'.css');
 					}
-					// [3588] check if the JavaScript file exists.
+					// [3669] check if the JavaScript file exists.
 					if (JFile::exists(JPATH_ROOT.'/media/com_costbenefitprojection/uikit/js/components/'.$name.$size.'.js'))
 					{
-						// [3591] load the js.
+						// [3672] load the js.
 						$this->document->addScript(JURI::root(true) .'/media/com_costbenefitprojection/uikit/js/components/'.$name.$size.'.js');
 					}
 				}
 			}
 		} 
 
-		// [3467] add the google chart builder class.
+		// [3548] add the google chart builder class.
 		require_once JPATH_COMPONENT_ADMINISTRATOR.'/helpers/chartbuilder.php';
-		// [3469] load the google chart js.
+		// [3550] 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'); 
 
-		// [6599] Add the CSS for Footable.
+		// [6766] Add the CSS for Footable.
 		$this->document->addStyleSheet(JURI::root() .'media/com_costbenefitprojection/footable/css/footable.core.min.css');
 
-		// [6601] Use the Metro Style
+		// [6768] 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');
 		}
-		// [6606] Use the Legacy Style.
+		// [6773] 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');
 		}
 
-		// [6611] Add the JavaScript for Footable
+		// [6778] 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/scaling_factor/submitbutton.js b/site/views/scaling_factor/submitbutton.js
index dba885e2..5f72cd97 100644
--- a/site/views/scaling_factor/submitbutton.js
+++ b/site/views/scaling_factor/submitbutton.js
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		submitbutton.js
diff --git a/site/views/scaling_factor/tmpl/edit.php b/site/views/scaling_factor/tmpl/edit.php
index cbfcad3f..7231e5f5 100644
--- a/site/views/scaling_factor/tmpl/edit.php
+++ b/site/views/scaling_factor/tmpl/edit.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		edit.php
diff --git a/site/views/scaling_factor/view.html.php b/site/views/scaling_factor/view.html.php
index 6f9f56ab..eb4f2987 100644
--- a/site/views/scaling_factor/view.html.php
+++ b/site/views/scaling_factor/view.html.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.1.0
-	@build			17th December, 2015
+	@build			23rd December, 2015
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
@@ -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');
-		// [10354] Built the actions for new and existing records.
+		// [10525] Built the actions for new and existing records.
 		if ($this->refid || $this->ref)
 		{
 			if ($this->canDo->get('scaling_factor.create') && $isNew)
 			{
-				// [10366] We can create the record.
+				// [10537] We can create the record.
 				JToolBarHelper::save('scaling_factor.save', 'JTOOLBAR_SAVE');
 			}
 			elseif ($this->canDo->get('scaling_factor.edit'))
 			{
-				// [10378] We can save the record.
+				// [10549] We can save the record.
 				JToolBarHelper::save('scaling_factor.save', 'JTOOLBAR_SAVE');
 			}
 			if ($isNew)
 			{
-				// [10383] Do not creat but cancel.
+				// [10554] Do not creat but cancel.
 				JToolBarHelper::cancel('scaling_factor.cancel', 'JTOOLBAR_CANCEL');
 			}
 			else
 			{
-				// [10388] We can close it.
+				// [10559] We can close it.
 				JToolBarHelper::cancel('scaling_factor.cancel', 'JTOOLBAR_CLOSE');
 			}
 		}
@@ -116,7 +116,7 @@ class CostbenefitprojectionViewScaling_factor extends JViewLegacy
 		{
 			if ($isNew)
 			{
-				// [10396] For new records, check the create permission.
+				// [10567] 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'))
 				{
-					// [10423] We can save the new record
+					// [10594] We can save the new record
 					JToolBarHelper::apply('scaling_factor.apply', 'JTOOLBAR_APPLY');
 					JToolBarHelper::save('scaling_factor.save', 'JTOOLBAR_SAVE');
-					// [10426] We can save this record, but check the create permission to see
-					// [10427] if we can return to make a new one.
+					// [10597] We can save this record, but check the create permission to see
+					// [10598] 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();
-		// [10463] set help url for this view if found
+		// [10634] set help url for this view if found
 		$help_url = CostbenefitprojectionHelper::getHelpUrl('scaling_factor');
 		if (CostbenefitprojectionHelper::checkString($help_url))
 		{