Removed product search
Need to differentiate b/w 1st and 2nd case