Added additional support for 'active' search.

Did a search for 'date' and '_date' and found places we missed