collect more info into DB by query.py
make query.py to be a Class