Added new query elements, reorganised them in folders