MIFOSX-1533 Fix advanced search exception
Merge branch develop of upstream
Merge pull request #1157 from binaryking/MIFOSX-1533

MIFOSX-1533: Fix advanced search exception