Modify input parser

Date Parser takes only the part after the last 'by' and 'from' in input to parse