Added proper fields to expenses list
Added search by separate fields