added or filter for comments when user !=null