|#25|Mesga,Sid|refactored code in bookmark builder and bookmarkservice