#126 removed ordering from first line for all and from my_structure for non admin userws