refine alignment in queries main