diff --git a/library/src/main/java/com/pchmn/materialchips/ChipsInput.java b/library/src/main/java/com/pchmn/materialchips/ChipsInput.java
index ba3dbd56..58d92131 100644
--- a/library/src/main/java/com/pchmn/materialchips/ChipsInput.java
+++ b/library/src/main/java/com/pchmn/materialchips/ChipsInput.java
@@ -265,6 +265,10 @@ public void onTextChanged(CharSequence text) {
     public List<? extends ChipInterface> getSelectedChipList() {
         return mChipsAdapter.getChipList();
     }
+    
+    public ChipsAdapter getAdaptor() {
+        return mChipsAdapter;
+    }
 
     public String getHint() {
         return mHint;
diff --git a/library/src/main/java/com/pchmn/materialchips/adapter/ChipsAdapter.java b/library/src/main/java/com/pchmn/materialchips/adapter/ChipsAdapter.java
index 6e000411..23eef325 100644
--- a/library/src/main/java/com/pchmn/materialchips/adapter/ChipsAdapter.java
+++ b/library/src/main/java/com/pchmn/materialchips/adapter/ChipsAdapter.java
@@ -119,7 +119,11 @@ public int getItemViewType(int position) {
     public long getItemId(int position) {
         return mChipList.get(position).hashCode();
     }
-
+    
+    public ChipsInputEditText getChipsInputEditText() {
+        return mEditText;
+    } 
+  
     private void initEditText() {
         mEditText.setLayoutParams(new RelativeLayout.LayoutParams(
                 ViewGroup.LayoutParams.WRAP_CONTENT,
@@ -298,7 +302,8 @@ public void removeChip(ChipInterface chip) {
         if (mChipList.size() == 0)
             mEditText.setHint(mHintLabel);
         // refresh data
-        notifyDataSetChanged();
+        //notifyDataSetChanged();
+        notifyItemRangeChanged(1,mChipList.size());
     }
 
     public void removeChip(int position) {
@@ -311,7 +316,8 @@ public void removeChip(int position) {
         if (mChipList.size() == 0)
             mEditText.setHint(mHintLabel);
         // refresh data
-        notifyDataSetChanged();
+        //notifyDataSetChanged();
+        notifyItemRangeChanged(1,mChipList.size());
     }
 
     public void removeChipById(Object id) {
diff --git a/library/src/main/java/com/pchmn/materialchips/views/FilterableListView.java b/library/src/main/java/com/pchmn/materialchips/views/FilterableListView.java
index 8e94cd52..61894f93 100644
--- a/library/src/main/java/com/pchmn/materialchips/views/FilterableListView.java
+++ b/library/src/main/java/com/pchmn/materialchips/views/FilterableListView.java
@@ -132,6 +132,7 @@ public void fadeIn() {
         int[] coord = new int[2];
         mChipsInput.getLocationInWindow(coord);
         ViewGroup.MarginLayoutParams layoutParams = (MarginLayoutParams) getLayoutParams();
+        //if (layoutParams != null) {
         layoutParams.topMargin = coord[1] + mChipsInput.getHeight();
         // height of the keyboard
         layoutParams.bottomMargin = rootView.getHeight() - r.bottom;
@@ -141,6 +142,7 @@ public void fadeIn() {
         anim.setDuration(200);
         startAnimation(anim);
         setVisibility(VISIBLE);
+        //}
     }
 
     /**