Fixed some issues - sub-topics not coming back properly (or too many coming back)