sevel minor fixes
Merge pull request #16 from kleer-la/story/basicsearch

Several minor fixes