Drastically improved order filter performance, fixed timezone bug and reverted some changes