Only perform suffix query when requested