Made sure plan queries return plan handles