Fix bug id
REFACTOR tags regarding resolved or new bugs; ADD some scenarios