fixes and refactoring for contests aliases