LPS-41138

Hey Hugo,

I was exactly sure how to order this method. I pull out the StringBundlers to keep all of the filterMap.put's together but not sure if they should be left inline. Let me know.

Thanks.