Provide an option to non-client specific forms to be removed from the user's portal view.

At the moment, we have forms that are non-client specific / generic. These forms does not have anything under the client field which makes it appear on all clients as it is set to be allowed on the portal and messenger. This is ideally for clients that does not have their own specific form. 

Can we have an option to limit the visibility or hide these types of forms from specific clients?

Might be an option as well to just create a contact tag to provide permissions to users who needs access to these forms?