NBIA-769 Fix for Advanced Search