Vinay | #2368 | Remove postfetch filter. Update prefetch filter. Minor refactoring