Refactored facet link generator, fixed params bug