More fix for querying a secondary