Adjust timestamp logic

• Add deduct's timestamp logic so that user can properly filter out the deduct they want.
• bug fixes.