Changed query for N-N+1 to show leading and trailing underscore.