Historic query syntax update.
Merge branch 'feature/historicSyntaxUpdate' into develop