Fixed sort_query hybrid property handling