You should move this test to the top of processMVBasedQueryFix to save lots of processing.