Searching improvement (sync with 1.5)