Begin just shop
Fix location based search bug