small update to fix rakefile deprecations and ResourceQuery class variables