[Layout]: Fixed query order
[Layout]: Fixed using deprecated registry key