Gallery filter stopped

[Coopedup]

Hi,

This is my first post (Hi!) and a question on my first app. 

I have a dashboard screen that has a search field and gallery with static values (All, Low and High) which drives the filter on my gallery record view.  I don't have an "All" status so if selected I filter only on the search text, if Low or High is selected then the filter is based on that status and search text.   This has stopped working and will no longer filter based on status values selected (only lists the full list). If I remove the search on the Risk ID field it will work, but this is a simple Sharepoint list text field (e.g. SOA 001, SOA 002 etc.). Any ideas?

If(
    RiskFilterChoice_2.Selected.Name = "All",
    Filter(
        'Risk Register - Trial',
        RiskSearchBox_1.Text in 'Risk ID' Or RiskSearchBox_1.Text in 'Risk Title'
    ),
    Filter(
        'Risk Register - Trial',
        RiskSearchBox_1.Text in 'Risk ID' Or RiskSearchBox_1.Text in 'Risk Title' And RiskFilterChoice_2.Selected.Name in 'Inherent Risk Rating' 
    )
)

"This function can be delegated but the selection formula used prevented the datasource from processing the query.It might not work correctly on large data sets and an incorrect result might be returned.The data row limit for non-delegable queries defined in the app settings is 2000."

[Coopedup · Accepted solution]

 Found a solution, but still unsure of what it worked then stopped. 

Added () around my two Or statements. 

If(
    RiskFilterChoice_2.Selected.Name = "All",
    Filter(
        'Risk Register - Trial',
        (RiskSearchBox_1.Text in 'Risk ID' Or RiskSearchBox_1.Text in 'Risk Title')
    ),
    Filter(
        'Risk Register - Trial',
        (RiskSearchBox_1.Text in 'Risk ID' Or RiskSearchBox_1.Text in 'Risk Title') And RiskFilterChoice_2.Selected.Name in 'Inherent Risk Rating' 
    )
)