fix issue #337 by reverting change from MR !557 (fix for issue #321) and filtering the vop in account history