Fixed errors in table, removed slow query placement