Improvements to index, support for filter and date sort