More findcluster optimisations