Issue 2127 sitesearch incremental containers