fixed find and added queue count with messages