fix(be): Fixes and refactor of features included in milestone-1

This branch serves as a fix branch of milestone-1 branch

Related MR: !23 (merged)

Signed-off-by: Erik Belko xbelko1@fi.muni.cz