Fixing apply business

@cohitre I believe the requirement was we store this separately in the database. What was the reason to combine them back into one?