Users search improvements