fixes #15363 - construct correct templates query for new hosts
(cherry picked from commit 8e2a541fc065180e338bf537d461f13e396b9b4c)
fixes #15363 - construct correct templates query for new hosts
(cherry picked from commit 8e2a541fc065180e338bf537d461f13e396b9b4c)