Add some more validation
Fix selectedPayloadObject category