fixed some labelling issue, ticket has been created