Remove unneeded query
Minor fix in base collection
Avoid setting a null view
Avoid destroying an unset view
Unregister controller when needed