Added support for indexing null values