Fixed number_of_terms issue to show less facets
Merge remote-tracking branch 'origin' into release