Get criteria table mostly working