BRANCH 4.3: some alignment fixes in advanced search