ETL.py Fixed Database Queries.
Analytics moved to new table structure.