Search options, improving filtering

I have over 1000 rdp connections in 300+ folders and wish to be able to search for a session (filter using the search function)
is there an efficient way to assign a searchable field or information to a folder (for inheritance) or to rdp sessions?

The only way I can see at present is to batch edit all existing folders and assign "company name" on the information tab.
is there anyway to inherit information or achieve the result required as connections are named after the servers and not company so do not currently show in a search for that company.
an inheritable company field or company information would allow a search to show all connections for a folder (company) or site without having to edit all current and new connections.


any work around you can think of at present?