fix user vs users vs all issue