improve option filter