#274: Updated user search