Fix some inconsistencies in SQL requests building
Use user_picture::fields everywhere possible instead of hardcoding the user name fields
Cleanup after merge