Smart annotations minor refactoring. [SCI-884, SCI-889]
Smart annotations minor refactoring. [SCI-884, SCI-889]

mlorb/scinote-web,Ducz0r/scinote-web,mlorb/scinote-web,Ducz0r/scinote-web,mlorb/scinote-web,Ducz0r/scinote-web