Add comment about moving logic to the model
Fix issue with serializing unicode queries