added rr:subject support, improved rr:tableName support