1. Refactored SQLCommander
2. Fixed activities' query bugs