Avoid unnecessary second pass on name-based queries
patch by jbellis; reviewed by slebresne for CASSANDRA-5577