EUCA-7858
also wired expando to use proper collection that search uses