I've made those changes, but wasn't sure about a couple of things.
For the ckbox criteria I made the Keyword AND value "AND" and the Keyword OR value ", "
But what should the separator and column have been? I just left them as they were, which was AND and RevisionID.
What I had before was only searching records which had at least one profile added, whereas now it is searching all records again, so that's definitely right.
But if you search on the checkboxes the results are looking a bit random.
I've attached the updated files.