diff --git a/services/integration/invoiceIntegration.js b/services/integration/invoiceIntegration.js
index 67b9b81..2328c5f 100644
--- a/services/integration/invoiceIntegration.js
+++ b/services/integration/invoiceIntegration.js
@@ -242,7 +242,8 @@ const createNegativeFeeForDiscount = (memberData, dateRange) => {
     let membershipFeeForDiscount = 0;
     membershipFees.forEach((membershipFee) => {
         const {name, price} = membershipFee;
-        if (DISCOUNT_PLANS.indexOf(name) !== -1){
+        const cleanName = name.replace('[', '').replace(']', '').trim();
+        if (DISCOUNT_PLANS.indexOf(cleanName) !== -1){
             membershipFeeForDiscount = price;
         }
     });
@@ -310,6 +311,7 @@ const getMembersFeesForDateRange = (dateRange, memberIds) => {
                     }
                 });
 
+                const memberIdTeamMappings = {};
                 const membersMap = {};
                 const oneMemberObject = {
                     totalBookedHours: 0,
@@ -323,13 +325,12 @@ const getMembersFeesForDateRange = (dateRange, memberIds) => {
                         bookingData: Object.assign({}, oneMemberObject),
                         membershipFees: membershipsMap[member.memberId] || [],
                     };
-                });
 
-                const memberIdTeamMappings = {};
-                membersList.forEach((member) => {
                     memberIdTeamMappings[member.memberId] = member.teamId;
                 });
 
+                const memberIdsToUse = memberIds.length > 0 ? memberIds : Object.keys(membersMap);
+
                 const allFees = [];
 
                 allIncidents.forEach((incident) => {
@@ -440,7 +441,7 @@ const getMembersFeesForDateRange = (dateRange, memberIds) => {
                 });
 
                 //add discount
-                memberIds.forEach((memberId) => {
+                memberIdsToUse.forEach((memberId) => {
                     const discountFee = createNegativeFeeForDiscount(membersMap[memberId], dateRange);
                     if (discountFee){
                         allFees.push(discountFee);
diff --git a/services/officeRnD/memberships.js b/services/officeRnD/memberships.js
index 7049179..fbef195 100644
--- a/services/officeRnD/memberships.js
+++ b/services/officeRnD/memberships.js
@@ -39,12 +39,8 @@ const reformatMembershipsName = (memberships) => {
             memberships.forEach((membership) => {
                 const { name, _id } = membership;
 
-                if (name && name.length > 0 && name[0] !== '['){
-                    DISCOUNT_PLANS.forEach((discountPlan) => {
-                        if (name === discountPlan){
-                            asyncMembershipUpdates.push(API.put(`memberships/${_id}`, {name: `[${name}]`}));
-                        }
-                    });
+                if (name && name.length > 0 && name[0] !== '[' && DISCOUNT_PLANS.indexOf(name) !== -1){
+                    asyncMembershipUpdates.push(API.put(`memberships/${_id}`, {name: `[${name}]`}));
                 }
             });