Working, but still adding correct behavior for not displaying entries of only 1