Fix #591 - Update to HUD filter code