Advanced quick search.: refs  #612, #554
Advanced quick search.: refs  #612, #554, commit after Merge