Initial assets filtering, more support for many-to-many relations, code style and fixing of bugs