added support for stored fields and highlighting results