Emergency fix for issues with bmark get query.

- This was done to fix pgsql tests, but breaks things.
- Reverting until more work can be done to test and get the bmark get query
correct.