Resolved issue #20 and issue #21

Resolved by adding Hive queries to the script