BootStrap changed to run on prod mode and some reports commented to do not be computed
Conflicts resolved
Query bug related to the costs fixed