Selector and fileter added, refactoring