Shelf Filter now filled with filtercolor
Merge commit '17f04ced5bfc182669a1cc1d44ae59d5d98d317f'