improvements to query_desc and limit_desc