Closes #888 Swap custom search with document type in search type