Added support for legacy bug reports fix #2
Some cleaning