WHISTLE-1869: restrict listener to just reg query