Fixed searching a shop by product and refactored.