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