20866 - Bug Fixes for Advanced Search