some fixes in users selector