Updated DataSelect, initial implementation of {$tableName} var replacement in where()