update queries to work with new schema and real data

Created by  boogerlad  on February 10, 2020
KRP35NGEHSKKLQP522S7LNZN37U7Z23Q7CDTWQMRKS2NHSA6CKXQC
Change contents