what/which/that

Dear members

She just produced (what /which) was in her, and brought us a rich treasure of music.

They discovered that people who were given popularity rankings were more likely to select (that / what) the website claimed were favorite choices.

Which ones in the brackets on the sentences above are correct to use?

Thanks

mbouti