index more attributes (see #96)
html escape query (closes #142)