Updated scanner to allow more flexibility with id's

Signed-off-by: Brandyn A. White <bwhite@dappervision.com>