#16: search speed improvements