temp fix tooltip and add new facetting features