Fixing issues on marks controller