Record referenced_entity for auto-guessed query parameters
Use helper method to determine if characteristic is enumeration
Do not resort parameters derived from name, only do it during comparisons