Added static attributes extension + faceting support