update Shop & create fixes in Validate