Correctly match with separator

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
Eliminate duplicates

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>