Fix previous trunk commit: use validators instead of a settings-dependent unique-key constraint, remove duplicate avatar_img_div CSS class
Cleanup, Minify
Fix PoI regression