Minor changes, used Collections2.filter in ExpenditureDatasource