damaz77 improvements + maybe search work