improve search behaviour