Fix error in dates returned by type.

The anniversary and birthday type were injected back into the results
after filtering by type.
Change some action names to be consistent
PHP 5.4 Warning fix.