Shenton:
	- Re-added all filters to the store/restore methods used by the database methods
