added support for multiple fields from the same store