making search work
merge from master