Fix for array filtering not being considered during refactoring