Added support for item queries