Products and Services List

I know I have previously submitted something similar to this - but having done team training today, its come back up. When making an invoice, we have a huge list of products and service items now and its getting ridiculous to find things - Please can we have a way to introduce grouping on items (nested lists or expanding lists) so its not all there at once. It was also suggested that maybe a search box at the top of the list so we can filter by something we need eg “massage” Same goes for appointments on the appointment booking list too really !