refactored work with wiki context