HOVAS-1031 Adding referrals to the suffix catchalls