Started on improving filtering conditions of source