Search Bugfix #2