Only append non_unique parameter if a uid is provided as well