More improvements, now facets are clickable!