separate locators for validate and sanitize
update config, unit tests, and container tests
php 5.3 compat
php 5.3 compat