Add regex checks for entity names and URLs