Added filter to limit string length