removed searching from DB for FirstYes