Fixed former searches preliminary. Maybe the whole former searches stuff should be refactored sometime.