Renumbered elements using wrong query to sort; folders are prioritised and they shuoldn't.

Details: <p><strong>Testing:</strong></p><p>- Make sure numbering formats for components <strong>does not</strong> use sheet number is query.&nbsp; (Standard basic numbering format should do...)</p><p>- Create a project that as (in the following order):</p><p>- A sheet</p><p>- A folder with a sheet</p><p>- Insert components on both sheet and run renumbering.</p><p>- The component inserted on the sheet directly under the project should get numbered before teh sheet within the folder.</p>