Support for empty results for queries added
HTML template updated
Linkage rules were not correctly shown