Adding severity and environments to sample search criteria