fix collections
fix models relations
fix collections
views minor fixes