Added the manufacturer filter, and abstracted with the colour filter. Fixes #22