[NX-19] Fix double quotes

Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>
[NX-19] Implement marking

Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>