Added second shop to test for seach functionality among some minor cleanup