working allmost all except for terminal add and mod, also missing to
finish the combo options ( second combo) in query