Update command processing logic for identify
Up to version 1.8.1