added support for OWF and fixed certain drill down and selection related bugs.