implemented changes regarding detection of view types and default views as discussed with SWA (ticket #771)