Refactoring NAFQA-158: Add Check for Helper and Controller rewrites
 - fixed problems after refactoring
Implemented NAFQA-158: Add Check for Helper and Controller rewrites