Fixed behaviour of basicsearch