Updated pagination
Fixed orConditions and View