Adding more variants of a partial select query. Separating bloat from the table definition.