query construction changes.