Small changes to Help Authoring Tool(cherry picked from commit 4cb6727860852da919b3299f69ec1928beb0272d)