fix queries to scope
fix comments tests
fix code style
change hierarchy of controllers on correct