latinize query and layout improvements