fixed shop validation (cherry picked from commit 5f8c0b3)