fixed the filtering for the handler and added the nonce call back