Couch bugfix to fallback for missing views
Misc tweaks