[NX-219] Include search criteria while expanding versions