20140921 - Added support for threaded view