Change default query keys, resolves #462
Add capability for IconClass in template first definitions