Fixed handling of empty user options
Fixed profile visitors in overlay not being sorted
Merge branch '2.0'