Added extra expenses
Optimizing javascript querys