GH: Some fixes to the trap selector