Merge branch 'RSherman_LEX'

SQL performance - minor bug fixes