#737 Minimized count of queries, when rendering page