Work out bug in product search after paginate addition