Patched how some data queries are handled.