Removed field limiter logic and simplified sorting logic.