AJ-1573 Improve some rubrics functionality.