Various fixes

Fixes hard coded property id on region mapping and some lint issues.

Also fixes #340 with a simple indexOf('?') check