Started to add tags to contextual resolution