Changed keys from violations and facts to keys table
Queries improved