clean up
make sure the entity is own able when filter = leaders
remove unnecessary iframe form submission for avatar uploading - fix by @kulbakin