fixed client query to preserve server query without limit and skip options