Make the queries work in a simpler way without all the way member access.