search: match users: empty? instead of size == 0

+ indentations
Some changed have been reverted when merging a couple of time