Ok, so I threw this in there and there has to be a better way.  I don't want to test whether showDisabled is true in the next block to decide whether to include an "AND".  So if I have it in both places it is always valid.  Is this fine, or does this just mean that I'm building my query all wrong?