New key HY_PKG_LOCATION for query
cosmetic: put HY_PKG_LOCATION into the lists alphabetically.

(where still possible)