fix privacy related queries