Fixes

Some fixes and add a feature to show document's content with query words
in bold