Search revamp

I agree. This makes it unclear.
As a side-note, Go doesn't mind this :)