changed search source, various improvements