Improve 1.5 search