changed filter criteria from AND to OR, name changes, url changes, remove duplicates.

Signed-off-by: Joe Whitsitt <joe-whitsitt@uiowa.edu>