Fix primary attribution display on sqp
Add support for different swatches for paint