BRANCH 4.3: some alignment fixes in advanced search
Merge branch 'remkonoteboom/4.3' into remkonoteboom/4.4