Library and Filter.. Fix Validate...