Add variable search and order separation to strong form