Cleanups

One more... Thanks to Ema it has now Util:: replacements as well. For the rest, a couple bug fixes and more refactorings.

/me is trying to reduce the number of them queries in user controllers. :)
They aren't always done nicely, but IMHO we can see a better way once we make more subs functions and try to use them, and tweak them accordingly (or remove duplicates even, if it happens)