bug fixes for erroneous links in info-view, comparisons not working well
with 'optional-queries', and parameter ordering