Dev searchcommons

merging the latest bugfix into dev-searchcommons