407315 : refactored for Facet Detection API

Signed-off-by: Fred Bricon <fbricon@gmail.com>