BUG. Add some fixes on add Shop