minor fixes, modified search behaviour