Always load results from subtemplate search, even if nothing returned,
otherwise subtemplate search panel will hang
Merge remote-tracking branch 'upstream/2.10.x' into 2.10.x