diff --git a/mix/CodeModel.cpp b/mix/CodeModel.cpp
index a96ab8791..3d0f0c749 100644
--- a/mix/CodeModel.cpp
+++ b/mix/CodeModel.cpp
@@ -93,8 +93,24 @@ private:
 	bool m_functionScope;
 	uint m_storageSlot;
 };
+
+dev::eth::AssemblyItems filterLocations(dev::eth::AssemblyItems const& _locations, dev::solidity::ContractDefinition const& _contract, QHash<LocationPair, QString> _functions)
+{
+	dev::eth::AssemblyItems result;
+	result.reserve(_locations.size());
+	std::string sourceName = *_contract.getLocation().sourceName;
+	for (dev::eth::AssemblyItem item : _locations)
+	{
+		dev::SourceLocation const& l = item.getLocation();
+		if (sourceName != *l.sourceName || _contract.getLocation() == l || _functions.contains(LocationPair(l.start, l.end)))
+			item.setLocation(dev::SourceLocation(-1, -1, l.sourceName));
+		result.push_back(item);
+	}
+	return result;
 }
 
+} //namespace
+
 void BackgroundWorker::queueCodeChange(int _jobId)
 {
 	m_model->runCompilationJob(_jobId);
@@ -105,13 +121,11 @@ CompiledContract::CompiledContract(const dev::solidity::CompilerStack& _compiler
 	m_sourceHash(qHash(_source))
 {
 	std::string name = _contractName.toStdString();
-	auto const& contractDefinition = _compiler.getContractDefinition(name);
+	ContractDefinition const& contractDefinition = _compiler.getContractDefinition(name);
 	m_contract.reset(new QContractDefinition(nullptr, &contractDefinition));
 	QQmlEngine::setObjectOwnership(m_contract.get(), QQmlEngine::CppOwnership);
 	m_contract->moveToThread(QApplication::instance()->thread());
 	m_bytes = _compiler.getBytecode(_contractName.toStdString());
-	m_assemblyItems = _compiler.getRuntimeAssemblyItems(name);
-	m_constructorAssemblyItems = _compiler.getAssemblyItems(name);
 
 	dev::solidity::InterfaceHandler interfaceHandler;
 	m_contractInterface = QString::fromStdString(*interfaceHandler.getABIInterface(contractDefinition));
@@ -122,6 +136,8 @@ CompiledContract::CompiledContract(const dev::solidity::CompilerStack& _compiler
 
 	CollectDeclarationsVisitor visitor(&m_functions, &m_locals, &m_storage);
 	contractDefinition.accept(visitor);
+	m_assemblyItems = filterLocations(_compiler.getRuntimeAssemblyItems(name), contractDefinition, m_functions);
+	m_constructorAssemblyItems = filterLocations(_compiler.getAssemblyItems(name), contractDefinition, m_functions);
 }
 
 QString CompiledContract::codeHex() const
diff --git a/mix/qml/CodeEditorView.qml b/mix/qml/CodeEditorView.qml
index 7ea1e30d9..25ecbc98c 100644
--- a/mix/qml/CodeEditorView.qml
+++ b/mix/qml/CodeEditorView.qml
@@ -11,15 +11,6 @@ Item {
 	signal breakpointsChanged(string documentId)
 	signal isCleanChanged(var isClean, string documentId)
 
-	function getDocumentIdByName(fileName)
-	{
-		for (var i = 0; i < editorListModel.count; i++)	{
-			if (editorListModel.get(i).fileName === fileName) {
-				return editorListModel.get(i).documentId;
-			}
-		}
-		return null;
-	}
 
 	function getDocumentText(documentId) {
 		for (var i = 0; i < editorListModel.count; i++)	{
diff --git a/mix/qml/ProjectModel.qml b/mix/qml/ProjectModel.qml
index f4b73b601..ec7681f16 100644
--- a/mix/qml/ProjectModel.qml
+++ b/mix/qml/ProjectModel.qml
@@ -64,6 +64,7 @@ Item {
 	function renameDocument(documentId, newName) { ProjectModelCode.renameDocument(documentId, newName); }
 	function removeDocument(documentId) { ProjectModelCode.removeDocument(documentId); }
 	function getDocument(documentId) { return ProjectModelCode.getDocument(documentId); }
+	function getDocumentIdByName(documentName) { return ProjectModelCode.getDocumentIdByName(documentName); }
 	function getDocumentIndex(documentId) { return ProjectModelCode.getDocumentIndex(documentId); }
 	function addExistingFiles(paths) { ProjectModelCode.doAddExistingFiles(paths); }
 	function deployProject() { ProjectModelCode.deployProject(false); }
diff --git a/mix/qml/WebPreview.qml b/mix/qml/WebPreview.qml
index 0bf31b326..768d188cb 100644
--- a/mix/qml/WebPreview.qml
+++ b/mix/qml/WebPreview.qml
@@ -156,7 +156,7 @@ Item {
 				if (urlPath === "/")
 					urlPath = "/index.html";
 				var documentName = urlPath.substr(urlPath.lastIndexOf("/") + 1);
-				var documentId = projectModel.codeEditor.getDocumentIdByName(documentName);
+				var documentId = projectModel.getDocumentIdByName(documentName);
 				var content = "";
 				if (projectModel.codeEditor.isDocumentOpen(documentId))
 					content = projectModel.codeEditor.getDocumentText(documentId);
diff --git a/mix/qml/html/codeeditor.js b/mix/qml/html/codeeditor.js
index 5d63a7a83..d61d6e51f 100644
--- a/mix/qml/html/codeeditor.js
+++ b/mix/qml/html/codeeditor.js
@@ -124,8 +124,6 @@ var executionMark;
 highlightExecution = function(start, end) {
 	if (executionMark)
 		executionMark.clear();
-	if (start === 0 && end + 1 === editor.getValue().length)
-		return; // Do not hightlight the whole document.
 	if (debugWarning)
 		debugWarning.clear();
 	executionMark = editor.markText(editor.posFromIndex(start), editor.posFromIndex(end), { className: "CodeMirror-exechighlight" });
diff --git a/mix/qml/js/ProjectModel.js b/mix/qml/js/ProjectModel.js
index 177115f83..25e8dcb77 100644
--- a/mix/qml/js/ProjectModel.js
+++ b/mix/qml/js/ProjectModel.js
@@ -172,7 +172,7 @@ function getDocumentIndex(documentId)
 	for (var i = 0; i < projectListModel.count; i++)
 		if (projectListModel.get(i).documentId === documentId)
 			return i;
-	console.error("Cant find document " + documentId);
+	console.error("Can't find document " + documentId);
 	return -1;
 }
 
@@ -291,6 +291,14 @@ function getDocument(documentId) {
 	return projectListModel.get(i);
 }
 
+function getDocumentIdByName(fileName)
+{
+	for (var i = 0; i < projectListModel.count; i++)
+		if (projectListModel.get(i).fileName === fileName)
+			return projectListModel.get(i).documentId;
+	return null;
+}
+
 function removeDocument(documentId) {
 	var i = getDocumentIndex(documentId);
 	var document = projectListModel.get(i);