Fix for commas in filter values

Change-Id: I42a922cc34f2108f7a73aa1286608092986b7aa1