updated with search by user