Fix filtering if filtering is not required
Remove useless filtering used for initial data load