fixed issue installing over top existing data
reordered to match most other queries