Add tag & section kicker options in model