replaced filter with action, and moved to close of function.
Makes it possible to call customer meta functions during filter
processing without creating infinite loop
misc
Merge remote-tracking branch 'origin/customer-meta-hardening'