update faceting
simplify faceting
add faceting on categories and keywords