Update regex
Check for None **and** empty string on message_title