Revert "T5 - Filter Options for Custom Fields"

This reverts commit f1050f95574ab1cdf25a0901d39e830a96e93ffc.