UI-2194: advance search improvemt