fix context and tag models, controllers