split code, fix dropdown