pdoify some of the static queries (#2)