improved default query slightly