Tidied up detection trigger stuff in find()