Fix sort_query regular property handling