[FIX] Removed useless SQL complexity and added model like order_by