some changes in the Query API (it can return raw entries)