Fix potential double include query

If a template includes query, adding it to assets breaks it.
Display label for plaintext fields if provided