Policy map fixes, and support 'search' parameter in scaffold.