Fixed card filtering for primary values

Still doesn’t take account of secondary values
Removed unused code
Fixed 2ndary card filter

Filtering now works properly for 2ndary child values
Card color disable fix, added Date content

Can now display dates on Cards
Default color used when color legend is “disable”
Merge pull request #179 from jehope/Redo-card-filtering

Redo card filtering