Add Search for User and Policy
Update PDF merge
config changes