more improvements on user searching