Re #1152 Keeping order of custom facets.
Re #1152 Remove logging.