Allow null values for current dimension filters
Placeholder for age block (measured in ciggis)
Add missing classes from smoking block
Add other filter dimensions