Collections fix (bug 834418); search cleanup