diff --git a/src/main/java/se/su/dsv/scipro/match/dataprovider/KeywordsDataProvider.java b/src/main/java/se/su/dsv/scipro/match/dataprovider/KeywordsDataProvider.java
index 82e4409e98..19c9e821fd 100644
--- a/src/main/java/se/su/dsv/scipro/match/dataprovider/KeywordsDataProvider.java
+++ b/src/main/java/se/su/dsv/scipro/match/dataprovider/KeywordsDataProvider.java
@@ -5,6 +5,7 @@ import java.util.Iterator;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 
 import se.su.dsv.scipro.data.dao.interfaces.Dao;
+import se.su.dsv.scipro.data.dao.interfaces.Dao.SortableParams.Sort;
 import se.su.dsv.scipro.dataproviders.SortSpecifier;
 import se.su.dsv.scipro.dataproviders.SortableDataProvider;
 import se.su.dsv.scipro.match.dao.interfaces.KeywordDao;
@@ -15,29 +16,34 @@ public class KeywordsDataProvider extends SortableDataProvider<Keyword>{
 
 	private static final long serialVersionUID = 1L;
 
-	private KeywordType keywordType = null;
-
 	@SpringBean
 	protected KeywordDao keywordDao;
+	private KeywordDao.Params params;
 
 	@Override
 	protected Dao<Keyword> getDao() {
 		return keywordDao;
 	}
 	
-	public KeywordsDataProvider(final SortSpecifier sortSpecifier, KeywordType keywordType) {
+	public KeywordsDataProvider(KeywordType keywordType, boolean includeDeleted) {
+		this(null, keywordType, includeDeleted);
+	}
+	
+	public KeywordsDataProvider(final SortSpecifier sortSpecifier, KeywordType keywordType, boolean includeDeleted) {
 		super(sortSpecifier, Keyword.class);
-		this.keywordType = keywordType;
+		params = new KeywordDao.Params();
+		params.setIncludeDeleted(includeDeleted);
+		params.setType(keywordType);
 	}
 	
 	public Iterator<Keyword> iterator(int first, int count) {
-		Iterator<Keyword> iter = keywordDao.getKeywords(keywordType, true).iterator();
+		Iterator<Keyword> iter = keywordDao.getKeywordList(params).iterator();
 		return iter;
 	}
 	
 	@Override
 	public int size() {
-		return keywordDao.getKeywords(keywordType, true).size();
+		return keywordDao.getKeywordList(params).size();
 	}
 
 }
\ No newline at end of file