Fixed wrong output and added munual feature filter