Convert data and query fields to jsonfield

[lingster]

Currently for the query and data fields these are stored as text, it would make sense to have these stored as json fields to ease searching. Add test cases to verify