Fix sort_query aliased hybrid_property handling
Add docs and tests for get_hybrid_properties