Added guest search part
Fixed conflicts