Add in app names and generalize product codes.
Generalize filter preparation