diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4de02494..eb30df63 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+###Version: 0.15.6
+- ```fix``` Transaction edit working again.
+- ```fix``` Alphabetical tag ordering works better with upper and lowercase letters.
+- ```fix``` Note auto-complete will not show suggestions from deleted transactions and from transactions of different type.
+
 ###Version: 0.15.5
 - ```new``` Note field in new transaction screen now has auto complete.
 - ```new``` Note field works as template.
diff --git a/financius/src/main/java/com/code44/finance/ui/tags/TagsActivity.java b/financius/src/main/java/com/code44/finance/ui/tags/TagsActivity.java
index ef883c53..59cbbb57 100644
--- a/financius/src/main/java/com/code44/finance/ui/tags/TagsActivity.java
+++ b/financius/src/main/java/com/code44/finance/ui/tags/TagsActivity.java
@@ -42,7 +42,7 @@ public static void startMultiSelect(Activity activity, int requestCode, List<Tag
     }
 
     @Override protected CursorLoader getModelsCursorLoader() {
-        return Tables.Tags.getQuery().sortOrder(Tables.Tags.TITLE.getName()).asCursorLoader(this, TagsProvider.uriTags());
+        return Tables.Tags.getQuery().sortOrder("lower(" + Tables.Tags.TITLE + ")").asCursorLoader(this, TagsProvider.uriTags());
     }
 
     @Override protected Model modelFrom(Cursor cursor) {
diff --git a/financius/src/main/java/com/code44/finance/ui/transactions/controllers/NoteViewController.java b/financius/src/main/java/com/code44/finance/ui/transactions/controllers/NoteViewController.java
index 0c259aa3..88b4622c 100644
--- a/financius/src/main/java/com/code44/finance/ui/transactions/controllers/NoteViewController.java
+++ b/financius/src/main/java/com/code44/finance/ui/transactions/controllers/NoteViewController.java
@@ -14,6 +14,8 @@
 import android.widget.ImageView;
 
 import com.code44.finance.R;
+import com.code44.finance.common.model.ModelState;
+import com.code44.finance.common.model.TransactionType;
 import com.code44.finance.common.utils.Strings;
 import com.code44.finance.data.Query;
 import com.code44.finance.data.db.Tables;
@@ -31,6 +33,7 @@ public class NoteViewController extends ViewController implements LoaderManager.
     private final ImageView noteImageView;
     private final AutoCompleteTextView noteAutoCompleteTextView;
     private final Callbacks callbacks;
+    private TransactionType transactionType = TransactionType.Expense;
 
     public NoteViewController(BaseActivity activity, View.OnClickListener clickListener, Callbacks callbacks) {
         this.callbacks = callbacks;
@@ -57,6 +60,8 @@ public NoteViewController(BaseActivity activity, View.OnClickListener clickListe
                 .projectionLocalId(Tables.Transactions.LOCAL_ID)
                 .projection(Tables.Transactions.NOTE.getName())
                 .selection(Tables.Transactions.DATE + ">?", String.valueOf(fromDate))
+                .selection(" and " + Tables.Transactions.TYPE + "=?", transactionType.asString())
+                .selection(" and " + Tables.Transactions.MODEL_STATE + "=?", ModelState.Normal.asString())
                 .groupBy(Tables.Transactions.NOTE.getName());
 
         if (!Strings.isEmpty(filter)) {
@@ -84,11 +89,11 @@ public NoteViewController(BaseActivity activity, View.OnClickListener clickListe
     }
 
     @Override public void onTextChanged(CharSequence s, int start, int before, int count) {
-        ((BaseActivity) this.noteAutoCompleteTextView.getContext()).getSupportLoaderManager().restartLoader(LOADER_NOTES, null, this);
-        callbacks.onNoteUpdated(getNote());
     }
 
     @Override public void afterTextChanged(Editable s) {
+        ((BaseActivity) this.noteAutoCompleteTextView.getContext()).getSupportLoaderManager().restartLoader(LOADER_NOTES, null, this);
+        callbacks.onNoteUpdated(getNote());
     }
 
     @Override public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
@@ -121,6 +126,11 @@ public void setIsSetByUser(boolean isSetByUser) {
         noteImageView.setImageAlpha(isSetByUser ? 255 : 64);
     }
 
+    public void setTransactionType(TransactionType transactionType) {
+        this.transactionType = transactionType;
+        ((BaseActivity) this.noteAutoCompleteTextView.getContext()).getSupportLoaderManager().restartLoader(LOADER_NOTES, null, this);
+    }
+
     public boolean hasFocus() {
         return noteAutoCompleteTextView.hasFocus();
     }
diff --git a/financius/src/main/java/com/code44/finance/ui/transactions/controllers/TransactionController.java b/financius/src/main/java/com/code44/finance/ui/transactions/controllers/TransactionController.java
index f576e8d9..5dc350fd 100644
--- a/financius/src/main/java/com/code44/finance/ui/transactions/controllers/TransactionController.java
+++ b/financius/src/main/java/com/code44/finance/ui/transactions/controllers/TransactionController.java
@@ -441,6 +441,7 @@ private void updateTransactionType(TransactionType transactionType) {
         amountViewController.setTransactionType(transactionType);
         accountsViewController.setTransactionType(transactionType);
         categoryViewController.setTransactionType(transactionType);
+        noteViewController.setTransactionType(transactionType);
     }
 
     private void updateAmount(long amount) {