case 2313 - Added checkboxes too facets.
case 2313 - Fixes after codereview.
Merge branch 'case-2313' into develop