fixed query, columns misaligned and FL added