Only strip table names for sql string queries.
Refactor query.include results serialization.