More improvements to part searching