Fixed the problems with crew and time search