Added false checks for contained text in attributes