GH-4 fix custom keys for ahs mode