Fixed another regression bug with filter on certain fields which are secondary to the data source. Such as the activity record type id.

Fixed regression bug with filter on certain fields which are secondary to the data source. Such as the activity record type id.

This reverts commit f1cd21a5.