Some more improvements on search behaviour and style