Merge pull request #37 from wardi/canada-v2.0

fix for 500 error on non-int int query parameters
fix for local use of datastore api