[HELIX-100] Use .equals instead of == for scope