Reverted estimated to before switch to pagination directive broke everything