Fix activeOption and better performance