Reuser earlie search and minor bugfixes