Bugfix with search. Please use this master version for future branches!