REFACTOR
REFACTOR Order separted from query