Fix the SKU search logic so it works with other filters. Closes #5208