Updated with new query info

Got rid of tags, now we're just querying against the JSON item
properties