Updated validation utility
Updated validation handling in demo page