Added further search terms and put them in files rather than hard-coded.