Fix Bug & refactoring of Pseudo-Relevance Feedback