This commit adds product search and some improvements