[BUGFIX] ADWD-1147 Fixed display of all facet values

This patch also fixes ADWD-1144
Merge pull request #53 from subugoe/ADWD-1147

[BUGFIX] ADWD-1147 Fixed display of all facet values