Add validation filter #1435