Minor changes and a bug fix on find TpUsers