Revert "Remove _.isEmpty usage and optimise collection view filterer."

This reverts commit cbac12ff8d67c93ea2ae0702b99d7c00e7acfcc6.