Fix export

This branch is to fix search export,  defects in relation to  DSC-139.