Alias incident table in case there's a prefix.
Use i as an alias and also alias tables in subqueries.
Merge pull request #1105 from jlewallen/develop

Alias incident table in case there's a prefix.